timeless <timeless@mozdev.org> [Fri, 18 Dec 2015 18:32:15 +0000] rev 27458
rebase: mention conflict in documentation instead of merge
timeless <timeless@mozdev.org> [Fri, 18 Dec 2015 18:31:45 +0000] rev 27457
rebase: simplify documentation about heads
timeless <timeless@mozdev.org> [Fri, 18 Dec 2015 18:22:03 +0000] rev 27456
rebase: simplify documentation about --keep
Also include a warning about bookmarks
timeless <timeless@mozdev.org> [Fri, 18 Dec 2015 18:24:41 +0000] rev 27455
rebase: simplify documentation about selecting commits to rebase
timeless <timeless@mozdev.org> [Fri, 18 Dec 2015 18:06:43 +0000] rev 27454
rebase: simplify documentation about public commits
add reference to graft
Matt Mackall <mpm@selenic.com> [Sun, 20 Dec 2015 16:33:44 -0600] rev 27453
verify: clean up weird error/warning lists
Nested functions in Python are not able to assign to variables in the
outer scope without something like the list trick because assignments
refer to the inner scope. So, we formerly used a list to give an
object to assign into.
Now that error and warning are object members, the [0] hack is no
longer needed.
timeless <timeless@mozdev.org> [Fri, 18 Dec 2015 18:52:25 +0000] rev 27452
diff: clarify comparison as first parent
timeless <timeless@mozdev.org> [Fri, 18 Dec 2015 06:19:22 +0000] rev 27451
histedit: add progress support
Yuya Nishihara <yuya@tcha.org> [Sun, 20 Dec 2015 18:38:21 +0900] rev 27450
verify: remove unreachable code to reraise KeyboardInterrupt
KeyboardInterrupt should never be caught as it doesn't inherit Exception in
Python 2.5 or later. And if it was, "interrupted" would be printed twice.
https://docs.python.org/2.7/library/exceptions.html#exception-hierarchy
Matt Mackall <mpm@selenic.com> [Sun, 20 Dec 2015 16:34:54 -0600] rev 27449
merge with stable