mergetools / vimdiff3on commit Merge branch 'bw/push-submodule-only' (792e22e)
   1. "$MERGE_TOOLS_DIR/vimdiff"