| commit | a757c646ee78ae21c9e8ac66dcc52e361c15c7d2 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 25 Mar 2010 02:21:32 +0000 (24 19:21 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 25 Mar 2010 02:35:34 +0000 (24 19:35 -0700) | ||
| tree | 192c2ed53220b1973ba21eda68bd0b847b0e0291 | treesnapshot (tar.gz zip) |
| parent | 8588567c96490b8d236b1bc13f9bcb0dfa118efe | commitdiff |
diff --check: honor conflict-marker-size attribute
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| diff.c | diffblobblamehistory | |
| t/t4017-diff-retval.sh | diffblobblamehistory |