|
From: | Stefan Monnier |
Subject: | [Gnu-arch-users] Re: identical changes conflict |
Date: | Tue, 29 Mar 2005 10:17:31 -0500 |
User-agent: | Gnus/5.11 (Gnus v5.11) Emacs/22.0.50 (gnu/linux) |
> But there *is* a conflict. Maybe you *want* the line to be added twice. > How should tla know? Well, diff3 knows that it shouldn't be considered as a conflict. So, just use "tla star-merge --three-way" and those conflicts will be resolved safely for you. Stefan
[Prev in Thread] | Current Thread | [Next in Thread] |