From: Chris Mason <mason@suse.com>
To: linux-kernel@vger.kernel.org
Subject: [CFT] reject merging program
Date: Wed, 17 Nov 2004 13:21:25 -0500 [thread overview]
Message-ID: <1100715685.18452.17.camel@watt.suse.com> (raw)
Hello everyone,
I've been using Neil Brown's wiggle program for a while to merge
rejects, but it doesn't do quite what I need. I've written a
(hopefully) less complex program with a shorter feature list.
rej just tries to find the right place in the file for the reject hunks,
and then pops up a merge tool (vimdiff, kdiff3, tkdiff etc) so you can
review the differences and pick the correct lines in the file.
It does try to do line based merging, and frequently gets it right. Of
course, this doesn't relieve you from checking the results against the
reject, but should make merging easier.
The (very beta) first release is here:
ftp://ftp.suse.com/pub/people/mason/rej/rej-0.4.tar.gz
-chris
reply other threads:[~2004-11-17 23:50 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=1100715685.18452.17.camel@watt.suse.com \
--to=mason@suse.com \
--cc=linux-kernel@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
all inboxes | Powered by JetHome®