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 [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
- References:
- Re: more git updates..
- From: Linus Torvalds <[email protected]>
- Re: more git updates..
- From: Linus Torvalds <[email protected]>
- Re: more git updates..
- From: Linus Torvalds <[email protected]>
- Re: Re: more git updates..
- From: Petr Baudis <[email protected]>
- [ANNOUNCE] git-pasky-0.1
- From: Petr Baudis <[email protected]>
- Re: [ANNOUNCE] git-pasky-0.1
- From: Ingo Molnar <[email protected]>
- Re: [ANNOUNCE] git-pasky-0.1
- From: Willy Tarreau <[email protected]>
- Re: [ANNOUNCE] git-pasky-0.1
- From: Ingo Molnar <[email protected]>
- Re: Re: [ANNOUNCE] git-pasky-0.1
- From: Petr Baudis <[email protected]>
- Re: Re: [ANNOUNCE] git-pasky-0.1
- From: Linus Torvalds <[email protected]>
- Re: Re: Re: [ANNOUNCE] git-pasky-0.1
- From: Petr Baudis <[email protected]>
- Re: [ANNOUNCE] git-pasky-0.1
- From: Paul Jackson <[email protected]>
- Re: more git updates..
- Prev by Date: Re: Re: more git updates..
- Next by Date: GIT license (Re: Re: Re: Re: Re: [ANNOUNCE] git-pasky-0.1)
- Previous by thread: Re: [ANNOUNCE] git-pasky-0.1
- Next by thread: Re: Re: Re: [ANNOUNCE] git-pasky-0.1
- Index(es):
 |