Merge branch 'jk/reflog-walk-maint' into maint
[git/raj.git] / mergetools / gvimdiff2
blob04a5bb0ea8484244e420ef13072773623c5b0366
1 . "$MERGE_TOOLS_DIR/vimdiff"