merge with /dev/null as base, instead of punting O==empty case
authorJunio C Hamano <junkio@cox.net>
Tue, 8 Nov 2005 06:03:46 +0000 (22:03 -0800)
committerJunio C Hamano <junkio@cox.net>
Sat, 12 Nov 2005 05:18:17 +0000 (21:18 -0800)
commitf7d24bb...fb06c40f7738f471dda561ab45496d24
tree1d11962...876dc24e31d0f520fe86447ade63cec2copy hash to clipboard (tree)
parent6fd72e3...af8a69615d32c3fd4d5fe0788f54a2eacopy hash to clipboard (diff)
git-merge-one-file.sh