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 <[email protected]> 1.650.933.1373, 1.925.600.0401
-
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/
- Follow-Ups:
- Re: [ANNOUNCE] git-pasky-0.1
- From: "Randy.Dunlap" <[email protected]>
- Re: [ANNOUNCE] git-pasky-0.1
- 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: more git updates..
- Prev by Date: Re: New SCM and commit list
- Next by Date: Re: Re: Re: Re: [ANNOUNCE] git-pasky-0.1
- Previous by thread: Re: GIT license (Re: Re: Re: Re: Re: [ANNOUNCE] git-pasky-0.1)
- Next by thread: Re: [ANNOUNCE] git-pasky-0.1
- Index(es):
 |