Mercurial
Mercurial
>
hg-stable
/ file revision
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
.
mercurial/__init__.py
author
Jordi Gutiérrez Hermoso <jordigh@octave.org>
Wed, 12 Aug 2015 08:53:01 -0400
changeset 26223
ed12abab068e
parent 0
9117c6561b0b
child 27220
4374d819ccd5
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.