![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 6 Apr 2010 21:50:46 +0000 (14:50 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 6 Apr 2010 21:50:46 +0000 (14:50 -0700) | ||
| commit | 3f3f8d9d09cdb6810e848d82583749e6080d2167 | |
| tree | 5f85fe29add68b68d375c0c74f0791f811f4692c | tree | snapshot |
| parent | f9bdf9b2102bd848c7a3eabff2ba5af63828de54 | commit | diff |
| parent | a757c646ee78ae21c9e8ac66dcc52e361c15c7d2 | commit | diff |
Merge branch 'jc/conflict-marker-size'
* 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 |