Mercurial
Mercurial
>
hg-stable
/ changelog
summary
|
shortlog
| changelog |
graph
|
tags
|
bookmarks
|
branches
|
files
|
help
(0)
-10000
-3000
-1000
-300
-100
-30
-10
-3
+3
+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
.
Tue, 25 Feb 2014 20:29:14 +0100
copies: when both sides made the same copy, report it as a copy
changeset
Mads Kiilerich <madski@unity3d.com> [Tue, 25 Feb 2014 20:29:14 +0100] rev 20641
copies: when both sides made the same copy, report it as a copy Not used yet ... but shows up in debug output.
Sun, 02 Mar 2014 18:36:02 +0100
merge: handle create+delete prompts in calculateupdates
changeset
Mads Kiilerich <madski@unity3d.com> [Sun, 02 Mar 2014 18:36:02 +0100] rev 20640
merge: handle create+delete prompts in calculateupdates I would like to move it all the way to the interactive resolve state like merges are ... but this is a first intermediate step.
Fri, 28 Feb 2014 02:26:03 +0100
merge: handle acceptremove of create+delete early in manifest merge
changeset
Mads Kiilerich <madski@unity3d.com> [Fri, 28 Feb 2014 02:26:03 +0100] rev 20639
merge: handle acceptremove of create+delete early in manifest merge
(0)
-10000
-3000
-1000
-300
-100
-30
-10
-3
+3
+10
+30
+100
+300
+1000
+3000
+10000
+30000
tip