Re: [ANNOUNCE] git-pasky-0.1

Randy.Dunlap
2005-04-11T00:16:11Z

On Sun, 10 Apr 2005 16:23:11 -0700 Paul Jackson wrote:

| 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/

or Chris Mason's 'rej' program:
ftp://ftp.suse.com/pub/people/mason/rej/

---
~Randy