@matheusbsbs / matheus-bagliano / commits / 72d1216a04
Fork 0

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>

Fredrik Kuivinen committed Dec 3, 2005 at 11:41 UTC 72d1216a04232f5cc85c6b41109db964b55f8289
1 file changed +25
t/t6020-merge-df.sh new
+25
@@ -0,0 +1,25 @@
1 +#!/bin/sh
2 +#
3 +# Copyright (c) 2005 Fredrik Kuivinen
4 +#
5 +
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'
24 +
25 +test_done