From: Fernando J. Pereda Date: Sat, 12 Nov 2005 22:39:14 GMT Subject: [PATCH Cogito] Fix t/t9300-seek.sh Message-ID: <20051112223914.GA1150@ferdyx.org> After 'seeking' to the first commit, identical should have 'identical' instead of 'nonconflicting'. Signed-off-by: Fernando J. Pereda --- t/t9300-seek.sh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) applies-to: 25610e0bf9968dc98709a8ca271db70806c2dbac 8c1240eaa91f1f805535287e7a6a037c341453b4 diff --git a/t/t9300-seek.sh b/t/t9300-seek.sh index d3fed11..55a3f19 100755 --- a/t/t9300-seek.sh +++ b/t/t9300-seek.sh @@ -82,8 +82,8 @@ test_expect_success 'current commit shou # "[ -e newdir/newfile ] && [ -e newdir/newfile.rej ]" test_expect_success 'different should be v1' \ "[ $(cat different) = v1 ]" -test_expect_success 'identical should be nonconflicting' \ - "[ $(cat identical) = nonconflicting ]" +test_expect_success 'identical should be identical' \ + "[ $(cat identical) = identical ]" test_expect_success 'unseeking' \ "cg-seek" --- 0.99.9g