From: Fredrik Kuivinen Date: Sat, 03 Dec 2005 10:41:20 GMT Subject: [PATCH 3/4] New test case: merge with directory/file conflicts Message-ID: <20051203104120.GD4896@c165.ib.student.liu.se> In-Reply-To: <20051203103255.GA4896@c165.ib.student.liu.se> Signed-off-by: Fredrik Kuivinen --- t/t6020-merge-df.sh | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) create mode 100755 t/t6020-merge-df.sh b1d7b5544a3890d2beb19286a328bc2f7e92cb6b diff --git a/t/t6020-merge-df.sh b/t/t6020-merge-df.sh new file mode 100755 index 0000000..a19d49d --- /dev/null +++ b/t/t6020-merge-df.sh @@ -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 -- 0.99.9.GIT