mergetools / gvimdiff2on commit Merge branch 'ed/simplify-setup-git-dir' (e805dc1)
   1. "$MERGE_TOOLS_DIR/vimdiff"