|
| From: | Aaron Bentley |
| Subject: | Re: [Gnu-arch-users] diff markers/ star merge |
| Date: | Sun, 21 Nov 2004 22:31:14 -0500 |
| User-agent: | Mozilla Thunderbird 0.8 (X11/20040926) |
John A Meinel wrote:
Who broke star-merge --three-way? I don't believe I did anything with it. (naturally, I could be wrong.)And, of course, what is broken about it?
Your win32 patch causes diff3 to be invoked with a --binary parameter. There's no --binary parameter for diff3.
Aaron
| [Prev in Thread] | Current Thread | [Next in Thread] |