summaryrefslogtreecommitdiff
path: root/git-merge.sh
diff options
context:
space:
mode:
authorLibravatar James Y Knight <foom@fuhm.net>2007-05-24 00:37:06 -0400
committerLibravatar Junio C Hamano <junkio@cox.net>2007-05-26 01:17:58 -0700
commit20b3d206acbbb042c7ad5f42d36ff8d036a538c5 (patch)
tree445101c83abb5dc70d9abc7418cd13aa28db01d7 /git-merge.sh
parentMore echo "$user_message" fixes. (diff)
downloadtgif-20b3d206acbbb042c7ad5f42d36ff8d036a538c5.tar.xz
Fix git-svn to handle svn not reporting the md5sum of a file, and test.
Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge.sh')
0 files changed, 0 insertions, 0 deletions