Lines Matching refs:unified
76 * unified-diff chunk to avoid adding non-diff text
116 * 08 Nov 2004, minor fix for resync of unified diffs checks for
127 * 04 Jan 2003, improve tracking of chunks in unified diff, in
165 * 12 Jun 1994, recognize unified diff, and output of makepatch.
668 * Decode a range for unified diff. Oddly, the comments in diffutils code
1147 int unified = 0;
1196 * in unified format. Check for those.
1199 unified = 2;
1212 * The markers for unified diff are a little different from the normal
1213 * context-diff. Also, the edit-lines in a unified diff won't have a
1235 unified = 2;
1238 marker = unified = 1;
1240 marker = unified = 2;
1241 } else if (unified == 2
1244 unified = 0;
1259 unified = -1;
1262 } else if (unified == 1 && !context) {
1264 * If unified==1, we guessed we would find a "+++" line, but since
1266 * we do not mistake the "---" for a unified diff with that for
1272 unified = 0;
1273 TRACE(("?? Expected \"+++\" for unified diff\n"));
1320 unified = 0;
1336 * If the previous line ended a chunk of a unified diff, we may begin
1338 * continue to accumulate counts for the unified diff which has ended.
1342 if (unified == 0) {
1527 if (!unified && !strcmp(buffer, "---")) {