diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-10-27 14:08:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-27 17:16:40 -0700 |
| commit | 65ac6e9c3f47807cb603af07a6a9e1a43bc119ae (patch) | |
| tree | 0f00787f3b6883e646563594fe4b45a8de297c07 /builtin-show-ref.c | |
| parent | merge-recursive: make a few functions static. (diff) | |
| download | tgif-65ac6e9c3f47807cb603af07a6a9e1a43bc119ae.tar.xz | |
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 'builtin-show-ref.c')
0 files changed, 0 insertions, 0 deletions