diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-11-30 02:37:06 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-30 02:37:06 -0800 |
| commit | 58cce8a85da745e20c9527c569a0e0935ff3ab30 (patch) | |
| tree | aa034aa4715069a0e3abe08628bc4393eaa34a61 /merge-base.c | |
| parent | diff-files: show diffs with stage0 and unmerged stage at the same time. (diff) | |
| download | tgif-58cce8a85da745e20c9527c569a0e0935ff3ab30.tar.xz | |
merge-recursive: match the unmerged index entry behaviour with merge-resolve
This minimally changes merge-recursive to match what happens
when O->A, O->B, A!=B 3-way filelevel merge leaves conflicts to
the new merge-resolve behaviour.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'merge-base.c')
0 files changed, 0 insertions, 0 deletions