summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-10-27 21:08:14 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-10-28 00:16:40 (GMT)
commit65ac6e9c3f47807cb603af07a6a9e1a43bc119ae (patch)
tree0f00787f3b6883e646563594fe4b45a8de297c07 /t
parent9fe0d87da36ce4a61359a4d5c2ea2547e29b4d04 (diff)
downloadgit-65ac6e9c3f47807cb603af07a6a9e1a43bc119ae.zip
git-65ac6e9c3f47807cb603af07a6a9e1a43bc119ae.tar.gz
git-65ac6e9c3f47807cb603af07a6a9e1a43bc119ae.tar.bz2
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>
Diffstat (limited to 't')
0 files changed, 0 insertions, 0 deletions