mergetools / gvimdiff3on commit Merge branch 'js/sequencer-and-root-commits' (c5aa4bc)
   1. "$MERGE_TOOLS_DIR/vimdiff"