mergetools / gvimdiff2on commit Merge branch 'jn/vcs-svn-cleanup' (18c88f9)
   1. "$MERGE_TOOLS_DIR/vimdiff"