Re: [ANNOUNCE] git-pasky-0.1

Paul Jackson
2005-04-10T23:27:41Z

Petr wrote:
> That reminds me, is there any
> tool which will take .rej files and throw them into the file to create
> rcsmerge-like conflicts?

Check out 'wiggle'
http://www.cse.unsw.edu.au/~neilb/source/wiggle/

--
I won't rest till it's the best ...
Programmer, Linux Scalability
Paul Jackson <pj@engr.sgi.com> 1.650.933.1373, 1.925.600.0401