Updates: Status: Fixed Comment #1 on issue 126 by cmpil... at gmail.com: 1.6 change: New conflict summary after 'svn update' and 'svn merge' http://code.google.com/p/svnbook/issues/detail?id=126 Finished this in r3972 (but did the work over the course of a few revisions).