| commit | 561b0fbb4a2d336faeb929380bddd6ec420d7b11 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 8 Jul 2007 21:42:05 +0000 (8 14:42 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 9 Jul 2007 01:24:19 +0000 (8 18:24 -0700) | ||
| tree | 1d7055f97fc27809e3f90fef9c2d9193bb6cd4be | treesnapshot (tar.gz zip) |
| parent | a7342913e21a96597f38ce0b48e3093c9739df1f | commitdiff |
Fix merge-one-file for our-side-added/our-side-removed cases
When commit ed93b449 changed the script so that it does not
touch untracked working tree file, we forgot that we still
needed to resolve the index entry (otherwise they are left
unmerged).
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When commit ed93b449 changed the script so that it does not
touch untracked working tree file, we forgot that we still
needed to resolve the index entry (otherwise they are left
unmerged).
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-merge-one-file.sh | diffblobblamehistory |