mergetools / gvimdiff2on commit Merge branch 'jk/mark-edges-uninteresting' (a6bec00)
   1. "$MERGE_TOOLS_DIR/vimdiff"