summaryrefslogtreecommitdiff
path: root/xdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-16 23:28:46 -0800
committerJunio C Hamano <gitster@pobox.com>2010-01-17 02:01:43 -0800
commit8588567c96490b8d236b1bc13f9bcb0dfa118efe (patch)
tree5c5f026346ef69293b14419028f15ecf39d5701d /xdiff
parent191f24171718e894cb5ba806bc45861ebac95e96 (diff)
downloadgit-8588567c96490b8d236b1bc13f9bcb0dfa118efe.tar.gz
rerere: honor conflict-marker-size attribute
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions