Searched +refs:diff +refs:merge +refs:strings (Results 1 - 1 of 1) sorted by relevance

/macosx-10.10/patch_cmds-17/diffstat/
H A Ddiffstat.c56 * message from some diff's (Ubuntu #269895).
76 * unified-diff chunk to avoid adding non-diff text
79 * default-diff output without the "diff" command
127 * 04 Jan 2003, improve tracking of chunks in unified diff, in
132 * merging to handle unusual Index/diff constructs in
144 * add check for diff from RCS archive where the
145 * "diff" lines do not reference a filename.
150 * 17 May 1998, handle Debian diff file
785 int diff = 0; local
1029 int merge = 0; local
[all...]

Completed in 139 milliseconds