Handle really trivial case inside git-merge.
authorJunio C Hamano <junkio@cox.net>
Sun, 2 Oct 2005 18:13:44 +0000 (11:13 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 2 Oct 2005 18:13:44 +0000 (11:13 -0700)
commitf9d7241...bcbf33ced45f12e17ef156abd73963f6
tree86dba37...7d5e0b583d7438c927db9e95b632ab68copy hash to clipboard (tree)
parent23822a3...5de674f1d1321ad7e112f0fe40124acacopy hash to clipboard (diff)
git-merge.sh