···107 struct diff_filespec *one;
108 struct diff_filespec *two;
109 unsigned short int score;
110- char status; /* M C R A D U etc. (see Documentation/diff-format.txt or DIFF_STATUS_* in diff.h) */
111 unsigned broken_pair : 1;
112 unsigned renamed_pair : 1;
113 unsigned is_unmerged : 1;
···107 struct diff_filespec *one;
108 struct diff_filespec *two;
109 unsigned short int score;
110+ char status; /* M C R A D U etc. (see Documentation/diff-format.adoc or DIFF_STATUS_* in diff.h) */
111 unsigned broken_pair : 1;
112 unsigned renamed_pair : 1;
113 unsigned is_unmerged : 1;