conflict-marker-size: new attribute
authorJunio C Hamano <gitster@pobox.com>
Sat, 16 Jan 2010 06:37:32 +0000 (22:37 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 17 Jan 2010 07:46:12 +0000 (23:46 -0800)
commit23a64c9...771e3caf19cf2ee9a32c8942ddde4a81
tree51ff4ae...71d4827c2380eb1f7d9397d09b72ef7acopy hash to clipboard (tree)
parent88533f6...64ae898e5f94fa22fa9b5fd43fe3e16ecopy hash to clipboard (diff)
ll-merge.c