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>
This commit is contained in:
Fredrik Kuivinen 2005-12-03 11:41:20 +01:00 committed by Junio C Hamano
parent d3bfdb755e
commit 72d1216a04

25
t/t6020-merge-df.sh Executable file
View File

@ -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