mergetools / gvimdiffon commit Merge branch 'sb/misc-cleanup' (2bdd872)
   1. "$MERGE_TOOLS_DIR/vimdiff"