summaryrefslogtreecommitdiff
path: root/t/t6020-merge-df.sh
diff options
context:
space:
mode:
authorFredrik Kuivinen <freku045@student.liu.se>2005-12-03 10:41:20 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-12-03 20:29:05 (GMT)
commit72d1216a04232f5cc85c6b41109db964b55f8289 (patch)
tree101331aeb001e6c77947a2d016ee6d485a2fdac9 /t/t6020-merge-df.sh
parentd3bfdb755e06c04492ad3977e7df3d780b6e02f2 (diff)
downloadgit-72d1216a04232f5cc85c6b41109db964b55f8289.zip
git-72d1216a04232f5cc85c6b41109db964b55f8289.tar.gz
git-72d1216a04232f5cc85c6b41109db964b55f8289.tar.bz2
New test case: merge with directory/file conflicts
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t6020-merge-df.sh')
-rwxr-xr-xt/t6020-merge-df.sh25
1 files changed, 25 insertions, 0 deletions
diff --git a/t/t6020-merge-df.sh b/t/t6020-merge-df.sh
new file mode 100755
index 0000000..a19d49d
--- /dev/null
+++ b/t/t6020-merge-df.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+#
+# Copyright (c) 2005 Fredrik Kuivinen
+#
+
+test_description='Test merge with directory/file conflicts'
+. ./test-lib.sh
+
+test_expect_success 'prepare repository' \
+'echo "Hello" > init &&
+git add init &&
+git commit -m "Initial commit" &&
+git branch B &&
+mkdir dir &&
+echo "foo" > dir/foo &&
+git add dir/foo &&
+git commit -m "File: dir/foo" &&
+git checkout B &&
+echo "file dir" > dir &&
+git add dir &&
+git commit -m "File: dir"'
+
+test_expect_code 1 'Merge with d/f conflicts' 'git merge "merge msg" B master'
+
+test_done