diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-13 10:46:23 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-13 10:46:23 -0800 |
| commit | e4d45dd3bb5bd8a1db2bc109f992560da22e9c4e (patch) | |
| tree | 1711624da89c387203a163227f857f8fcd0106f7 /t/t6024-recursive-merge.sh | |
| parent | 37adac765a469f8f8495e2befe7afeda65a2b272 (diff) | |
| parent | f953831e030d3ece7346bdb5c4fde4fde43c925e (diff) | |
| download | git-e4d45dd3bb5bd8a1db2bc109f992560da22e9c4e.tar.gz git-e4d45dd3bb5bd8a1db2bc109f992560da22e9c4e.tar.xz | |
Merge branch 'js/merge'
* js/merge:
merge-recursive: add/add really is modify/modify with an empty base
Get rid of the dependency on RCS' merge program
merge-file: support -p and -q; fix compile warnings
Add builtin merge-file, a minimal replacement for RCS merge
xdl_merge(): fix and simplify conflict handling
xdl_merge(): fix thinko
xdl_merge(): fix an off-by-one bug
merge-recursive: use xdl_merge().
xmerge: make return value from xdl_merge() more usable.
xdiff: add xdl_merge()
Diffstat (limited to 't/t6024-recursive-merge.sh')
| -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 9416c271e..964010e76 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 |