Adrian Schröter writes:

Just wanted to do something useful again this morning :)

build.opensuse.org has now a new special merge tool installed, which will be used to merge suse style changelog files (<package>.changes).

This is supposed to solve the typical breakage when you branch from some package and upstream and you are applying modifications.

Fantastic, thank you! For some reason I have one package which seems especially prone to confuse diff3, this is a very welcome feature.

--

Adrian Schroeter email: adrian@suse.de

SUSE LINUX GmbH, GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer, HRB 21284 (AG Nürnberg) Maxfeldstraße 5 90409 Nürnberg Germany

-- To unsubscribe, e-mail: opensuse-factory+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-factory+owner@opensuse.org

-- // Kristoffer Grönlund // kgronlund@suse.com -- To unsubscribe, e-mail: opensuse-buildservice+unsubscribe@opensuse.org To contact the owner, e-mail: opensuse-buildservice+owner@opensuse.org