mergetools / gvimdiff3on commit Merge branch 'jc/conflict-hint' into cc/interpret-trailers-more (216d29e)
   1. "$MERGE_TOOLS_DIR/vimdiff"