conflict-marker-size: add test and docs
commit4c734803cbd4fac667ba518460c2c0d8725ae3f7
authorJunio C Hamano <gitster@pobox.com>
Thu, 21 Jan 2010 07:49:27 +0000 (20 23:49 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 Jan 2010 07:49:27 +0000 (20 23:49 -0800)
tree6045c768063b1b8224e16b0544afc3d1819c4d65
parent2eb41d7200d15f4b12ad6497a99786ec5357217d
conflict-marker-size: add test and docs

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/gitattributes.txt
t/t6026-merge-attr.sh