summaryrefslogtreecommitdiff
path: root/t/t7610-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Petr Onderka <gsvick@gmail.com>2010-08-16 17:01:02 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-08-16 18:28:27 -0700
commitb221207db9950cb0993a30f38540ff235a0af64e (patch)
tree21071dbf8e9324a15df0661baf4dc005644e3050 /t/t7610-mergetool.sh
parentGit 1.7.2 (diff)
downloadtgif-b221207db9950cb0993a30f38540ff235a0af64e.tar.xz
Userdiff patterns for C#
Add userdiff patterns for C#. This code is an improved version of code by Adam Petaccia from 21 June 2009 mail to the list. Signed-off-by: Petr Onderka <gsvick@gmail.com> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7610-mergetool.sh')
0 files changed, 0 insertions, 0 deletions