Hello, Maybe that would help, as a starting point?
http://9fans.net/archive/2009/06/138 mathieu
--- Begin Message ---Hi all As I believe there a few hg users here. I was wondering if anybody has a way to use acme to resolve merge conflicts by showing the diffs in different panes. fernan
--- End Message ---
