Subject: [CFT] reject merging program
From: Chris Mason <mason@suse.com>
To: linux-kernel@vger.kernel.org
Content-Type: text/plain
Date: Wed, 17 Nov 2004 13:21:25 -0500
Message-Id: <1100715685.18452.17.camel@watt.suse.com>
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 950
Lines: 28

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


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/