mergetools / gvimdiffon commit Merge branch 'sb/submodule-move-nested' (0c7ecb7)
   1. "$MERGE_TOOLS_DIR/vimdiff"