mergetools / gvimdiffon commit Merge branch 'ak/cat-file-clean-up' (67b5440)
   1. "$MERGE_TOOLS_DIR/vimdiff"