Neels J Hofmeyr wrote: [...] > The map of diff code paths is still not entirely clear in my head (I still > grep and backtrace a lot for analysis). Some ASCII art could be quite > useful, also to see what parts of it affect 'merge'.
Agreed. I'll take a shot at that. - Julian
