Mercurial Mercurial > hg-stable / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/bundles/issue4438-r1.hg
author Jordi Gutiérrez Hermoso <jordigh@octave.org>
Wed, 12 Aug 2015 08:53:01 -0400
changeset 26223 ed12abab068e
parent 23233 c1f370dab456
permissions -rw-r--r--
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.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
23233
c1f370dab456 discovery: test coverage for issue4438 / 86c35b7ae300 / 73cfaa348650
Mads Kiilerich <madski@unity3d.com>
parents:
diff changeset 
     1
 
(binary:application/octet-stream)
hg-stable