mergetools / gvimdiff3on commit Merge branch 'sb/atomic-push' into mh/ref-trans-value-check (507d6aa)
   1. "$MERGE_TOOLS_DIR/vimdiff"