summaryrefslogtreecommitdiff
path: root/git-mergetool--lib.sh
diff options
context:
space:
mode:
authorLibravatar Frédéric Heitzmann <frederic.heitzmann@gmail.com>2011-09-16 21:55:03 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-09-16 14:06:19 -0700
commit26e4266f2fee3454370885ff480b38d045ca1731 (patch)
tree5f1d456fe22b8d98e4f89762cdb409648de26814 /git-mergetool--lib.sh
parentMerge branch 'ph/format-patch-no-color' (diff)
downloadtgif-26e4266f2fee3454370885ff480b38d045ca1731.tar.xz
Disambiguate duplicate t9160* tests
1e5814f created t9160-git-svn-mergeinfo-push.sh on 11/9/7 40a1530 created t9160-git-svn-preserve-empty-dirs.sh on 11/7/20 The former test script is renumbered to t9161. Signed-off-by: Frédéric Heitzmann <frederic.heitzmann@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions