[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnu-arch-users] Re: Merge tools that support .rej .orig rejects/conflic
[Gnu-arch-users] Re: Merge tools that support .rej .orig rejects/conflicts
Thu, 16 Sep 2004 18:55:24 +0900
BTW, after reading this thread, I tried out wiggle on some patch
rejects, and while it seemed to do a good job of wiggling, it also in
one case did something very bizarre that looks like a bug.
So it doesn't seem to be as solid as say `patch', which is slightly
worrying in such a critical application.
I now make sure to always use it to make a new diff file and verify what
it did first...
Oh, also it stomps on file permissions if you use the -replace option.
In New York, most people don't have cars, so if you want to kill a person, you
have to take the subway to their house. And sometimes on the way, the train
is delayed and you get impatient, so you have to kill someone on the subway.
- Re: [Gnu-arch-users] Merge tools that support .rej .orig rejects/conflicts, (continued)