mergetools / gvimdiffon commit Merge branch 'jc/test-must-be-empty' into next (2e64650)
   1. "$MERGE_TOOLS_DIR/vimdiff"