Robuta

https://lists.ubuntu.com/archives/bazaar/2009q2/057878.html [Success!] [MERGE][BUG #328171] 'merge --weave' conflicts on deleted lines successmergebugweaveconflicts