New test case: merge with directory/file conflicts
authorFredrik Kuivinen <freku045@student.liu.se>
Sat, 3 Dec 2005 10:41:20 +0000 (11:41 +0100)
committerJunio C Hamano <junkio@cox.net>
Sat, 3 Dec 2005 20:29:05 +0000 (12:29 -0800)
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
t/t6020-merge-df.sh [new file with mode: 0755]
diff --git a/t/t6020-merge-df.sh b/t/t6020-merge-df.sh
new file mode 100755 (executable)
index 0000000..a19d49d
--- /dev/null
@@ -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