mergetools / gvimdiffon commit Merge branch 'jk/pull-into-dirty-unborn' (833cd7f)
   1. "$MERGE_TOOLS_DIR/vimdiff"