From: Fredrik Kuivinen <freku045@student.liu.se>
To: junkio@cox.net
Cc: git@vger.kernel.org
Subject: [PATCH 0/4] Merge test cases
Date: Sat, 3 Dec 2005 11:32:55 +0100 [thread overview]
Message-ID: <20051203103255.GA4896@c165.ib.student.liu.se> (raw)
This series adds two test cases for merge strategies. The first one
test that something sensible is done in case of directory/file
conflicts, the second one tests a criss-cross merge.
- Fredrik
next reply other threads:[~2005-12-03 10:33 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-12-03 10:32 Fredrik Kuivinen [this message]
2005-12-03 10:40 ` [PATCH 1/4] git-merge: Exit with code 2 if no strategy was able to handle the merge Fredrik Kuivinen
2005-12-03 10:40 ` [PATCH 2/4] test-lib.sh: Add new function, test_expect_code Fredrik Kuivinen
2005-12-03 10:41 ` [PATCH 3/4] New test case: merge with directory/file conflicts Fredrik Kuivinen
2005-12-03 10:41 ` [PATCH 4/4] New test case: Criss-cross merge Fredrik Kuivinen
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=20051203103255.GA4896@c165.ib.student.liu.se \
--to=freku045@student.liu.se \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/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