Mercurial
Mercurial
>
hg
/ changelog
summary
|
shortlog
| changelog |
graph
|
tags
|
bookmarks
|
branches
|
files
|
zip
|
gz
|
bz2
|
help
(0)
-10000
-3000
-1000
-300
-100
-30
-10
-2
+2
+10
+30
+100
+300
+1000
+3000
+10000
+30000
tip
Find changesets by keywords (author, files, the commit message), revision number or hash, or
revset expression
.
Sat, 16 Jun 2012 17:05:55 +0900
graft: don't drop the second parent on unsuccessful merge (issue3498)
stable
changeset
Yuya Nishihara <yuya@tcha.org> [Sat, 16 Jun 2012 17:05:55 +0900] rev 17045
graft: don't drop the second parent on unsuccessful merge (
issue3498
) This replicates the strategy of rebase, which postpones setparents and duplicatecopies after checking the merge stats. Without the second parent, resolve cannot redo merge.
Wed, 27 Jun 2012 02:34:58 +0200
tests: add missing path globbing for Windows in svn tests
changeset
Mads Kiilerich <mads@kiilerich.com> [Wed, 27 Jun 2012 02:34:58 +0200] rev 17044
tests: add missing path globbing for Windows in svn tests
(0)
-10000
-3000
-1000
-300
-100
-30
-10
-2
+2
+10
+30
+100
+300
+1000
+3000
+10000
+30000
tip