mergetools / gvimdiff2on commit remote-bzr: fixes for older versions of bzr (31eb360)
   1. "$MERGE_TOOLS_DIR/vimdiff"