t6020: Modernize style a bit
Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Sep 20, 2010 at 02:28 UTC
d09c0a3935c6f28b1e7710f3f08a6ff5dec50f73
1 file changed
+20
-15
t/t6020-merge-df.sh
+20
-15
@@ -6,21 +6,26 @@
6
test_description='Test merge with directory/file conflicts'
7
. ./test-lib.sh
8
9
-test_expect_success 'prepare repository' \
10
-'echo "Hello" > init &&
11
-git add init &&
12
-git commit -m "Initial commit" &&
13
-git branch B &&
14
-mkdir dir &&
15
-echo "foo" > dir/foo &&
16
-git add dir/foo &&
17
-git commit -m "File: dir/foo" &&
18
-git checkout B &&
19
-echo "file dir" > dir &&
20
-git add dir &&
21
-git commit -m "File: dir"'
22
-
23
-test_expect_code 1 'Merge with d/f conflicts' 'git merge "merge msg" B master'
9
+test_expect_success 'prepare repository' '
10
+ echo Hello >init &&
11
+ git add init &&
12
+ git commit -m initial &&
13
+
14
+ git branch B &&
15
+ mkdir dir &&
16
+ echo foo >dir/foo &&
17
+ git add dir/foo &&
18
+ git commit -m "File: dir/foo" &&
19
+
20
+ git checkout B &&
21
+ echo file dir >dir &&
22
+ git add dir &&
23
+ git commit -m "File: dir"
24
+'
25
+
26
+test_expect_success 'Merge with d/f conflicts' '
27
+ test_must_fail git merge master
28
+'
29
30
test_expect_success 'F/D conflict' '
31
git reset --hard &&