rerere.hon commit merge.conflictstyle: choose between "merge" and "diff3 -m" styles (b541248)
   1#ifndef RERERE_H
   2#define RERERE_H
   3
   4#include "string-list.h"
   5
   6extern int setup_rerere(struct string_list *);
   7extern int rerere(void);
   8
   9#endif