nav[aria-label="Primary Navigation"] { padding: 0; & ul { list-style: none; width: 100%; display: flex; flex-direction: row; justify-content: start; align-items: start; gap: 30px; padding: 0; & li { margin: 0; } & ul li { list-style: none; } } }

what diff tool to use with mac version of sourcetree with hg?

Trying to figure out what tool to use on mac osx 10.7 for doing merge with sourcetree and hg

Accepted answers

All comments

FileMerge is actually a really good tool for both diffing and 3-way merging, and it's free (you get it automatically when you install XCode).

I've been using Kaleidoscope, which is a paid app. It's rather nice though.

Welcome!

It looks like you're new here. Sign in or register to get started.

Quick Links

Find more posts tagged with

sourcetree

mercurial