summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-12-24 10:18:35 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-12-24 10:18:35 (GMT)
commite036c90a913889dfa8097ebe73b619370e0c6f32 (patch)
tree2d910b13395345d9d9bc7c9137d1f6e9bb71d64a /t
parent9def2138a17325c68961c3b1e6c967d33f28a4f1 (diff)
parente0ec18192db8a5f80705a81dfaa1caa3e6c48c1a (diff)
downloadgit-e036c90a913889dfa8097ebe73b619370e0c6f32.zip
git-e036c90a913889dfa8097ebe73b619370e0c6f32.tar.gz
git-e036c90a913889dfa8097ebe73b619370e0c6f32.tar.bz2
Merge branch 'sb/merge-friendly'
* sb/merge-friendly: Display 'theirs' branch name when possible in merge. Use extended SHA1 syntax in merge-recursive conflicts.
Diffstat (limited to 't')
-rw-r--r--t/t6024-recursive-merge.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t6024-recursive-merge.sh b/t/t6024-recursive-merge.sh
index 964010e..69b18f7 100644
--- a/t/t6024-recursive-merge.sh
+++ b/t/t6024-recursive-merge.sh
@@ -59,18 +59,18 @@ 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
+<<<<<<< HEAD:a1
F
=======
G
->>>>>>> 26f86b677eb03d4d956dbe108b29cb77061c1e73/a1
+>>>>>>> G:a1
EOF
test_expect_success "result contains a conflict" "diff -u expect a1"
git ls-files --stage > out
cat > expect << EOF
-100644 f16f906ab60483c100d1241dfc39868de9ec9fcb 1 a1
+100644 da056ce14a2241509897fa68bb2b3b6e6194ef9e 1 a1
100644 cf84443e49e1b366fac938711ddf4be2d4d1d9e9 2 a1
100644 fd7923529855d0b274795ae3349c5e0438333979 3 a1
EOF