interdiff.hon commit merge-recursive: use 'ci' for rename_conflict_info variable name (043622b)
   1#ifndef INTERDIFF_H
   2#define INTERDIFF_H
   3
   4struct rev_info;
   5
   6void show_interdiff(struct rev_info *, int indent);
   7
   8#endif