path: root/t/
diff options
authorBert Wesarg <>2010-03-01 21:46:27 (GMT)
committerJunio C Hamano <>2010-03-03 05:16:44 (GMT)
commit11f3aa2305426d11945c72479d24a15d30768d50 (patch)
treea387ab1883e3e0f007ab306217972dde4306f98f /t/
parent560119b9abfa39504c93ed08735426dae947d5a9 (diff)
merge-file: add option to specify the marker size
This adds the abbility to specify the conflict marker size for merges outside a git repository. Signed-off-by: Bert Wesarg <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 't/')
1 files changed, 37 insertions, 0 deletions
diff --git a/t/ b/t/
index 6291307..9c5ef68 100755
--- a/t/
+++ b/t/
@@ -211,4 +211,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.
+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