mergetools / gvimdiff3on commit Merge branch 'ak/git-strip-extension-from-dashed-command' into maint (08e21c9)
   1. "$MERGE_TOOLS_DIR/vimdiff"