diff options
| author |  Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2006-12-13 04:05:39 +0100 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2006-12-12 21:55:37 -0800 |
| commit | f953831e030d3ece7346bdb5c4fde4fde43c925e (patch) | |
| tree | d1b9565216e59cb8af65829bf04fe18e58d964c3 /t | |
| parent | Merge branch 'master' into js/merge (diff) | |
| download | tgif-f953831e030d3ece7346bdb5c4fde4fde43c925e.tar.xz | |
merge-recursive: add/add really is modify/modify with an empty base
Unify the handling for cases C (add/add) and D (modify/modify).
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't')
| -rw-r--r--[-rwxr-xr-x] | t/t6024-recursive-merge.sh | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/t/t6024-recursive-merge.sh b/t/t6024-recursive-merge.sh index 9416c271eb..964010e764 100755..100644 --- a/t/t6024-recursive-merge.sh +++ b/t/t6024-recursive-merge.sh @@ -58,9 +58,19 @@ GIT_AUTHOR_DATE="2006-12-12 23:00:08" git commit -m F test_expect_failure "combined merge conflicts" "git merge -m final G" +cat > expect << EOF +<<<<<<< HEAD/a1 +F +======= +G +>>>>>>> 26f86b677eb03d4d956dbe108b29cb77061c1e73/a1 +EOF + +test_expect_success "result contains a conflict" "diff -u expect a1" + git ls-files --stage > out cat > expect << EOF -100644 f70f10e4db19068f79bc43844b49f3eece45c4e8 1 a1 +100644 f16f906ab60483c100d1241dfc39868de9ec9fcb 1 a1 100644 cf84443e49e1b366fac938711ddf4be2d4d1d9e9 2 a1 100644 fd7923529855d0b274795ae3349c5e0438333979 3 a1 EOF |