|
From: | Stefan Monnier |
Subject: | [Gnu-arch-users] Re: --forward mostly harmless |
Date: | Mon, 13 Sep 2004 17:27:12 -0400 |
User-agent: | Gnus/5.1006 (Gnus v5.10.6) Emacs/21.3.50 (gnu/linux) |
> OTOH I have noticed that patch _does_ tend to re-add hunks which are > already present instead of conflicting. Yes, this happens when the context is not sufficiently precise. Pretty common in ChangeLog files. This does not happen with --three-way. Stefan
[Prev in Thread] | Current Thread | [Next in Thread] |