Searched +refs:diff +refs:unified +refs:context (Results 1 - 5 of 5) sorted by relevance
| /macosx-10.10/patch_cmds-17/diffstat/ |
| H A D | diffstat.c | 56 * 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
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
132 * merging to handle unusual Index/diff construct
785 int diff = 0; local
1147 int unified = 0; local
1155 int context = 1; local
[all...] |
| /macosx-10.10/groff-38/groff/contrib/pdfmark/ |
| H A D | pdfroff.sh | 380 # we need to have both the 'awk' and 'diff' programs available.
394 DIFF=`searchpath diff "$PATH"`
396 test "$DIFF" = ":" && echo >&2 "$NOPROG 'diff' in PATH" && NO="$NO 'diff'"
441 # Report the unresolved references, as a diff between the two pass files,
442 # preferring 'unified' or 'context' diffs, when available
514 # (Missing 'awk' or 'diff' may have disabled it, to avoid display
|
| /macosx-10.10/vim-55/runtime/ |
| H A D | scripts.vim | 191 " - "diff" in first line (context diff)
193 " - "--- " in first line and "+++ " in second line (unified diff).
194 " - "*** " in first line and "--- " in second line (context diff).
195 " - "# It was generated by makepatch " in the second line (makepatch diff).
197 " - "=== ", line of "=", "---", "+++ " (SVK diff)
198 " - "=== ", "--- ", "+++ " (bzr diff, commo
[all...] |
| /macosx-10.10/vim-55/runtime/syntax/ |
| H A D | diff.vim | 2 " Language: Diff (context or unified)
95 syn match diffDiffer "^Les fichiers .* et .* sont diff��rents.$"
96 syn match diffBDiffer "^Les fichiers binaires .* et .* sont diff��rents.$"
301 "Some versions of diff have lines like "#c#" and "#d#" (where # is a number)
304 syn match diffFile "^diff.*"
332 let b:current_syntax = "diff"
|
| /macosx-10.10/emacs-93/emacs/lisp/ |
| H A D | diff-mode.el | 0 ;;; diff-mode.el --- a mode for viewing/editing context diffs
7 ;; Keywords: convenience patch diff
34 ;; diff-mode as well as with compilation-minor-mode
45 ;; - Try `diff <file> <hunk>' to try and fuzzily discover the source location
53 ;; - in diff-apply-hunk, strip context in replace-match to better
55 ;; - Handle `diff -b' output in context->unified
[all...] |
Completed in 124 milliseconds