mergetools / gvimdiff2on commit Merge branch 'mp/complete-paths' (c5443b2)
   1. "$MERGE_TOOLS_DIR/vimdiff"