| commit | 65ac6e9c3f47807cb603af07a6a9e1a43bc119ae | |
| author | Junio C Hamano <junkio@cox.net> | |
| Fri, 27 Oct 2006 21:08:14 +0000 (27 14:08 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sat, 28 Oct 2006 00:16:40 +0000 (27 17:16 -0700) | ||
| tree | 0f00787f3b6883e646563594fe4b45a8de297c07 | treesnapshot (tar.gz zip) |
| parent | 9fe0d87da36ce4a61359a4d5c2ea2547e29b4d04 | commitdiff |
merge-recursive: adjust to loosened "working file clobbered" check
The three-way merge by git-read-tree does not complain about
presense of the file in the working tree that is involved in a
merge when the merge result needs to be determined by the
caller. Adjust merge-recursive so that it makes sure that an
untracked file is not touched when the merge decides the path
should not be included in the final result.
Signed-off-by: Junio C Hamano <junkio@cox.net>
The three-way merge by git-read-tree does not complain about
presense of the file in the working tree that is involved in a
merge when the merge result needs to be determined by the
caller. Adjust merge-recursive so that it makes sure that an
untracked file is not touched when the merge decides the path
should not be included in the final result.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| merge-recursive.c | diffblobblamehistory |