mergetools / gvimdiff2on commit Merge branch 'cb/rebase-am-exit-code' into maint (3f8b439)
   1. "$MERGE_TOOLS_DIR/vimdiff"