Skip to main content

Browse the archive

Staging
v0.8.1
Revision a0cf49c16ae37177dcfcefa1149bf09f84721cf5 authored by Timo Hirvonen on 06 February 2008, 12:16:08 UTC, committed by Junio C Hamano on 06 February 2008, 22:02:41 UTC 
Fix parsing numeric color values
 
Numeric color only worked if it was at end of line.
Noticed by Chris Larson <clarson@kergoth.com>.

Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent f1c3239
Raw File
t6020-merge-df.sh 
#!/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
back to top