Hi, On Wednesday 16 of March 2011 07:14:15 Fernan Bolando wrote: > 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.
Having only experience with KDiff3, it seems to me it's mostly matter of: * synchronizing scrolling of four windows: (Base, Mine, Theirs, Output). The former three should occupy one column each while the Result window ought to span all three columns. Horizontal layout is also possible. * having some decent keyboard shortcuts: Next, Prev, Next Unsolved, Prev Unsolved, Choose A, Choose B, Choose C * marking common/different sections (A&B vs. C, A & C vs. B, A vs. B vs. C) with colors or some textual markers. The screenshot [1] is cluttered cause of small screen size, but usually it looks much better. I dunno if that's easy achievable in Acme. Perhaps a new program running directly in two (3 columns + 1 column) or four Rio windows would be better. [1] http://kdiff3.sourceforge.net/doc/screenshot_merge.png -- dexen deVries [[[↓][→]]] ``In other news, STFU and hack.'' mahmud, in response to Erann Gat's ``How I lost my faith in Lisp'' http://news.ycombinator.com/item?id=2308816
