mergetools / gvimdiffon commit Merge branch 'jn/push-tests' (ca54e43)
   1. "$MERGE_TOOLS_DIR/vimdiff"