mergetools / gvimdiffon commit Merge branch 'jk/cat-file-batch-optim' (356df9b)
   1. "$MERGE_TOOLS_DIR/vimdiff"