On Wed, 2006-11-29 at 04:49, Johannes Schindelin wrote: > As for your scenario: There really should be a "what to do when my merge > screwed up?" document. I have a few examples scenarios and some notes on cleaning up after failed merges in my slides from the presentation I did at OLS last summer. Feel free to look at it off of www.jdl.com! jdl