mergetools / gvimdiffon commit cat-file: move batch_options definition to top of file (bfd1559)
   1. "$MERGE_TOOLS_DIR/vimdiff"