mergetools / gvimdiffon commit Merge branch 'bc/submodule-status-ignored' (5636a20)
   1. "$MERGE_TOOLS_DIR/vimdiff"