![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 21 Jan 2010 07:49:27 +0000 (23:49 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 21 Jan 2010 07:49:27 +0000 (23:49 -0800) | ||
| commit | 4c734803cbd4fac667ba518460c2c0d8725ae3f7 | |
| tree | 6045c768063b1b8224e16b0544afc3d1819c4d65 | tree | snapshot |
| parent | 2eb41d7200d15f4b12ad6497a99786ec5357217d | commit | diff |
conflict-marker-size: add test and docs
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/gitattributes.txt | diff | blob | history | |
| t/t6026-merge-attr.sh | diff | blob | history |