mergetools / gvimdiffon commit Merge branch 'jk/quarantine-received-objects' (9f1384f)
   1. "$MERGE_TOOLS_DIR/vimdiff"