mergetools / gvimdiff2on commit Merge branch 'fc/show-branch-in-rebase-am' into maint (c9cae1e)
   1. "$MERGE_TOOLS_DIR/vimdiff"