mergetools / gvimdiff2on commit Merge branch 'jk/alias-in-bare' into maint (eeecf39)
   1. "$MERGE_TOOLS_DIR/vimdiff"