mergetools / vimdiff3on commit Merge branch 'js/rebase-config-bitfix' (8feb8e2)
   1. "$MERGE_TOOLS_DIR/vimdiff"