mergetools / gvimdiff2on commit Merge branch 'sr/gpg-interface-stop-at-the-end' into maint (c5d81d7)
   1. "$MERGE_TOOLS_DIR/vimdiff"