mergetools / gvimdiffon commit Merge branch 'sb/submodule-add-force' (1e6a893)
   1. "$MERGE_TOOLS_DIR/vimdiff"