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
.
mercurial/__init__.py
author
Mads Kiilerich <madski@unity3d.com>
Sun, 30 Nov 2014 19:35:54 +0100
changeset 23406
65f215ea3e8e
parent 0
9117c6561b0b
child 27220
4374d819ccd5
permissions
-rw-r--r--
tests: add test for rebasing merges with ancestors of the rebase destination This shows sub-optimal behaviour. The user gets a merge prompt that it is very hard to justify.
Ignore whitespace changes -
Everywhere:
Within whitespace:
At end of lines: