Re: [ANNOUNCE] git-pasky-0.1

[Randy.Dunlap]

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