mergetools / gvimdiff3on commit Merge branch 'ds/mark-parents-uninteresting-optim' into next (5a42c79)
   1. "$MERGE_TOOLS_DIR/vimdiff"