Merge branch 'maint'
[git/fastimport.git] / t / t6020-merge-df.sh
bloba19d49de28c457d1a5726400d25c1f731506a05f
1 #!/bin/sh
3 # Copyright (c) 2005 Fredrik Kuivinen
6 test_description='Test merge with directory/file conflicts'
7 . ./test-lib.sh
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"'
23 test_expect_code 1 'Merge with d/f conflicts' 'git merge "merge msg" B master'
25 test_done