protip: if you often do conflict merges in hg/git and that you uses vimdiff but it's really not so great, give a try to Splice (by Steve Losh), you need to learn it a bit (but it's fast and there is a podcast), it's really way way better.

(it's documentation includes how to configure it for git/hg)

Sign in to participate in the conversation

This is a mastodon instance for social justice activists, LGBTQIA+ people, and activists in general See the Goals and technical details, and Rules and privacy policy pages for more information