![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 7 Jul 2007 20:37:32 +0000 (13:37 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 7 Jul 2007 20:37:32 +0000 (13:37 -0700) |
* jc/diff-mark:
diff: honor binariness specified in attributes
Fix configuration syntax to specify customized hunk header patterns.
Per-path attribute based hunk header selection.
Future-proof source for changes in xdemitconf_t
Introduce diff_filespec_is_binary()
diff: honor binariness specified in attributes
Fix configuration syntax to specify customized hunk header patterns.
Per-path attribute based hunk header selection.
Future-proof source for changes in xdemitconf_t
Introduce diff_filespec_is_binary()
| 1 | 2 | |||
|---|---|---|---|---|
| builtin-rerere.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc builtin-rerere.c
Simple merge