Skip to navigation

Abort: unresolved merge conflicts (see 'hg help resolve')28.08.18

http://mercurial.808500.n3.nabble.com/hg-resolve-td801190.html

Reply

Anonymous

When in doubt, use brute force.