mergetools / gvimdiff3on commit Merge branch 'jc/test-lazy-prereq' (0ba92ef)
   1. "$MERGE_TOOLS_DIR/vimdiff"