Merge branch 'js/am-call-theirs-theirs-in-fallback-3way' into maint
[git] / mergetools / vimdiff3
1 . "$MERGE_TOOLS_DIR/vimdiff"