mergetools / gvimdiff3on commit Merge branch 'js/am-call-theirs-theirs-in-fallback-3way' into maint (174f9e6)
   1. "$MERGE_TOOLS_DIR/vimdiff"