mergetools / gvimdiff3on commit Merge branch 'jk/rebase-no-autostash' into maint (697bd28)
   1. "$MERGE_TOOLS_DIR/vimdiff"