mergetools / gvimdiff3on commit Merge branch 'jn/test-lint-unmoor' (3784ba3)
   1. "$MERGE_TOOLS_DIR/vimdiff"