summaryrefslogtreecommitdiff
path: root/xdiff
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-07-13 05:21:05 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-07-13 05:21:47 (GMT)
commite918c6abac65fb56b381f37cc139753fbe6768a3 (patch)
treecebfbda05e23180d239b6a2e81c49d23dd655aa2 /xdiff
parente130ddaaf3451d0bd60860cb0019e47c9f421442 (diff)
downloadgit-e918c6abac65fb56b381f37cc139753fbe6768a3.zip
git-e918c6abac65fb56b381f37cc139753fbe6768a3.tar.gz
git-e918c6abac65fb56b381f37cc139753fbe6768a3.tar.bz2
fmt-merge-msg fix
The new C version mistranslated the original Perl version in the case to pull from the HEAD. This made it to say nonsense like this: Merge commit ...url... of HEAD * HEAD: ... Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'xdiff')
0 files changed, 0 insertions, 0 deletions