conflict-marker-size: add test and docs
authorJunio C Hamano <gitster@pobox.com>
Thu, 21 Jan 2010 07:49:27 +0000 (23:49 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 Jan 2010 07:49:27 +0000 (23:49 -0800)
commit4c73480...cbd4fac667ba518460c2c0d8725ae3f7
tree6045c76...063b1b8224e16b0544afc3d1819c4d65copy hash to clipboard (tree)
parent2eb41d7...00d15f4b12ad6497a99786ec5357217dcopy hash to clipboard (diff)
Documentation/gitattributes.txt
t/t6026-merge-attr.sh