Re: Stacked GIT 0.3 (now more Quilt-like)

Catalin Marinas [off-list ref] wrote:

On Sun, 2005-07-03 at 14:38 +0200, Peter Osterlund wrote:

quoted

Catalin Marinas [off-list ref] writes:

quoted

I know that using -A gives a more detailed output in case of a conflict.
The problem is that you will get a conflict even if the changes are
identical, making it impossible to detect when a patch was merged
upstream.

quoted

OK, I see. How about using wiggle instead?

        http://cgi.cse.unsw.edu.au/~neilb/source/wiggle/

[...]

I haven't used wiggle before but I will give it a try (though I prefer
such a tool not to be too smart since it might make mistakes).

Last version is 0.6, released 2 years back... I'm not sure it is wise to
rely on abandonware.
-- 
Dr. Horst H. von Brand                   User #22616 counter.li.org
Departamento de Informatica                     Fono: +56 32 654431
Universidad Tecnica Federico Santa Maria              +56 32 654239
Casilla 110-V, Valparaiso, Chile                Fax:  +56 32 797513