aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-08-29 10:49:56 -0700
committerJunio C Hamano <gitster@pobox.com>2008-08-30 19:41:44 -0700
commitb541248467fa47979a34e3f1c5bbe3308fbdc4d1 (patch)
treeaf1b1accf5962ebb10b7422e5ec6479e78b31b66 /t
parent387c9d49815ef4b1cefda71cf27f199d9fb24083 (diff)
downloadgit-b541248467fa47979a34e3f1c5bbe3308fbdc4d1.tar.gz
git-b541248467fa47979a34e3f1c5bbe3308fbdc4d1.tar.xz
merge.conflictstyle: choose between "merge" and "diff3 -m" styles
This teaches "git merge-file" to honor merge.conflictstyle configuration variable, whose value can be "merge" (default) or "diff3". Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t6023-merge-file.sh9
1 files changed, 8 insertions, 1 deletions
diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh
index 20786ce79..b76bca888 100755
--- a/t/t6023-merge-file.sh
+++ b/t/t6023-merge-file.sh
@@ -192,10 +192,17 @@ non timebo mala, quoniam TU mecum es:
virga tua et baculus tuus ipsa me consolata sunt.
EOF
-test_expect_success '"diff3 -m" style output' '
+test_expect_success '"diff3 -m" style output (1)' '
test_must_fail git merge-file -p --diff3 \
new8.txt new5.txt new9.txt >actual &&
test_cmp expect actual
'
+test_expect_success '"diff3 -m" style output (2)' '
+ git config merge.conflictstyle diff3 &&
+ test_must_fail git merge-file -p \
+ new8.txt new5.txt new9.txt >actual &&
+ test_cmp expect actual
+'
+
test_done