Merge branch 'ds/doc-two-kinds-of-tags'
[git/jrn.git] / mergetools / gvimdiff
blob04a5bb0ea8484244e420ef13072773623c5b0366
1 . "$MERGE_TOOLS_DIR/vimdiff"