mergetools / gvimdiff2on commit Merge branch 'mg/gpg-interface-using-status' into maint (b771d8d)
   1. "$MERGE_TOOLS_DIR/vimdiff"