mergetools / gvimdiffon commit Merge branch 'dt/empty-submodule-in-merge' (a616162)
   1. "$MERGE_TOOLS_DIR/vimdiff"