Merge branch 'js/sequencer-and-root-commits'
[git] / mergetools / gvimdiff2
1 . "$MERGE_TOOLS_DIR/vimdiff"