mergetools / gvimdiffon commit Merge branch 'sn/null-pointer-arith-in-mark-tree-uninteresting' (782ca8c)
   1. "$MERGE_TOOLS_DIR/vimdiff"