mergetools / gvimdiff3on commit t5539: update a flaky test (f0e802c)
   1. "$MERGE_TOOLS_DIR/vimdiff"