summaryrefslogtreecommitdiff
path: root/t/t6023-merge-file.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-03-20 18:29:34 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-03-20 18:29:34 (GMT)
commit2bb76e139e3ab503992d227103f2bbb806b1f04b (patch)
tree3f69bde406db6eeb33f81f8fdd6d64035111a07d /t/t6023-merge-file.sh
parent96203bb074544a37fcff9c3f2a68582b76caa263 (diff)
parent3a15048d833e2d6599091a9f7c14b0fa926c3bbf (diff)
downloadgit-2bb76e139e3ab503992d227103f2bbb806b1f04b.zip
git-2bb76e139e3ab503992d227103f2bbb806b1f04b.tar.gz
git-2bb76e139e3ab503992d227103f2bbb806b1f04b.tar.bz2
Merge branch 'bw/union-merge-refactor'
* bw/union-merge-refactor: merge-file: add option to select union merge favor merge-file: add option to specify the marker size refactor merge flags into xmparam_t make union merge an xdl merge favor
Diffstat (limited to 't/t6023-merge-file.sh')
-rwxr-xr-xt/t6023-merge-file.sh37
1 files changed, 37 insertions, 0 deletions
diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh
index d605024..5034dd1 100755
--- a/t/t6023-merge-file.sh
+++ b/t/t6023-merge-file.sh
@@ -215,4 +215,41 @@ test_expect_success '"diff3 -m" style output (2)' '
test_cmp expect actual
'
+cat >expect <<\EOF
+Dominus regit me,
+<<<<<<<<<< new8.txt
+et nihil mihi deerit;
+
+
+
+
+In loco pascuae ibi me collocavit;
+super aquam refectionis educavit me.
+||||||||||
+et nihil mihi deerit.
+In loco pascuae ibi me collocavit,
+super aquam refectionis educavit me;
+==========
+et nihil mihi deerit,
+
+
+
+
+In loco pascuae ibi me collocavit --
+super aquam refectionis educavit me,
+>>>>>>>>>> new9.txt
+animam meam convertit,
+deduxit me super semitas jusitiae,
+propter nomen suum.
+Nam et si ambulavero in medio umbrae mortis,
+non timebo mala, quoniam TU mecum es:
+virga tua et baculus tuus ipsa me consolata sunt.
+EOF
+
+test_expect_success 'marker size' '
+ test_must_fail git merge-file -p --marker-size=10 \
+ new8.txt new5.txt new9.txt >actual &&
+ test_cmp expect actual
+'
+
test_done