t6020: Modernize style a bit
Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
707983484b
commit
d09c0a3935
@ -6,21 +6,26 @@
|
||||
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_success 'prepare repository' '
|
||||
echo Hello >init &&
|
||||
git add init &&
|
||||
git commit -m initial &&
|
||||
|
||||
test_expect_code 1 'Merge with d/f conflicts' 'git merge "merge msg" B master'
|
||||
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_success 'Merge with d/f conflicts' '
|
||||
test_must_fail git merge master
|
||||
'
|
||||
|
||||
test_expect_success 'F/D conflict' '
|
||||
git reset --hard &&
|
||||
|
Loading…
Reference in New Issue
Block a user