mergetools / gvimdiffon commit am: support --patch-format=mboxrd (d9925d1)
   1. "$MERGE_TOOLS_DIR/vimdiff"