Merge branch 'fr/sequencer-fail-with-not-one-upon-no-ff'
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"