mergetools / gvimdiff2on commit Merge branch 'mp/diff-algo-config' (abea4dc)
   1. "$MERGE_TOOLS_DIR/vimdiff"