From: "Fernando J. Pereda" <ferdy@ferdyx.org>
To: git@vger.kernel.org
Subject: [PATCH Cogito] Fix t/t9300-seek.sh
Date: Sat, 12 Nov 2005 23:39:14 +0100 [thread overview]
Message-ID: <20051112223914.GA1150@ferdyx.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 932 bytes --]
After 'seeking' to the first commit, identical should have 'identical'
instead of 'nonconflicting'.
Signed-off-by: Fernando J. Pereda <ferdy@gentoo.org>
---
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
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
next reply other threads:[~2005-11-12 22:39 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-11-12 22:39 Fernando J. Pereda [this message]
2005-11-12 22:47 ` [PATCH Cogito] Fix t/t9300-seek.sh Petr Baudis
2005-11-12 22:55 ` Fernando J. Pereda
2005-11-12 23:01 ` Fernando J. Pereda
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20051112223914.GA1150@ferdyx.org \
--to=ferdy@ferdyx.org \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).