Fix merge-one-file for our-side-added/our-side-removed cases
authorJunio C Hamano <gitster@pobox.com>
Sun, 8 Jul 2007 21:42:05 +0000 (14:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Jul 2007 01:24:19 +0000 (18:24 -0700)
commit561b0fb...4a2d336faeb929380bddd6ec420d7b11
tree1d7055f...7fc27809e3f90fef9c2d9193bb6cd4becopy hash to clipboard (tree)
parenta734291...e21a96597f38ce0b48e3093c9739df1fcopy hash to clipboard (diff)
git-merge-one-file.sh