mergetools / gvimdiff2on commit mergetools/vimdiff: trust Vim's exit code (2967284)
   1. "$MERGE_TOOLS_DIR/vimdiff"