![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 10 Apr 2010 05:38:34 +0000 (22:38 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 10 Apr 2010 05:38:34 +0000 (22:38 -0700) | ||
| commit | daaf2e8892cf3b652454c48ffd332e3c5b446b92 | |
| tree | cdf705c81efd7e7916bd2bc361274ed26543fa5f | tree | snapshot |
| parent | 326bea47cb7315a7ee8e428dbf6b1052ffb01b00 | commit | diff |
| parent | a757c646ee78ae21c9e8ac66dcc52e361c15c7d2 | commit | diff |
Merge branch 'jc/conflict-marker-size' into maint
* jc/conflict-marker-size:
diff --check: honor conflict-marker-size attribute
* jc/conflict-marker-size:
diff --check: honor conflict-marker-size attribute
| diff.c | diff1 | | diff2 | | blob | history |
| t/t4017-diff-retval.sh | diff1 | | diff2 | | blob | history |