mergetools / gvimdiff2on commit Merge branch 'pt/am-abort-fix' into maint (c36e465)
   1. "$MERGE_TOOLS_DIR/vimdiff"