Mercurial > hg

comparison COPYING @ 26223:ed12abab068e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
simplemerge: enable option to resolve conflicts one way With this change, the simplemerge algorithm grows an option to only return the local or the other hunk in a conflicting region.
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
date Wed, 12 Aug 2015 08:53:01 -0400
parents 8c8b55733cbd
children
comparison
equal deleted inserted replaced
26222:3095b1027661 26223:ed12abab068e