[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnu-arch-users] Re: identical changes conflict
From: |
Catalin Marinas |
Subject: |
[Gnu-arch-users] Re: identical changes conflict |
Date: |
Tue, 22 Mar 2005 17:11:53 +0000 |
User-agent: |
Gnus/5.1007 (Gnus v5.10.7) Emacs/21.3 (gnu/linux) |
Aaron Bentley <address@hidden> wrote:
> Deliverable Mail wrote:
>> If tla were to check that the result of aplying file.rej to the last
>> commit would indeed yield the file <=> file.orig, perhaps it might see
>> there's no conflict and not bother with it?
>
> tla can use --three-way for star-merge, which will handle such
> situations gracefully.
Isn't star-merge --three-way using diff3 as the merging tool? AFAIK,
diff3 reports a conflict for this situation (or am I missing some
options passed to diff3?)
--
Catalin