Mercurial > hg

log

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | rev 20642: (0) -10000 -3000 -1000 -300 -100 -30 -10 -7 +7 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip
age author description
Tue, 25 Feb 2014 20:29:46 +0100 Mads Kiilerich merge: use the right ancestor when both sides copied the same file
Tue, 25 Feb 2014 20:29:14 +0100 Mads Kiilerich copies: when both sides made the same copy, report it as a copy
Sun, 02 Mar 2014 18:36:02 +0100 Mads Kiilerich merge: handle create+delete prompts in calculateupdates
Fri, 28 Feb 2014 02:26:03 +0100 Mads Kiilerich merge: handle acceptremove of create+delete early in manifest merge
Sun, 02 Mar 2014 18:30:41 +0100 Mads Kiilerich largefiles: override calculateupdates instead of manifestmerge
Tue, 25 Feb 2014 20:28:40 +0100 Mads Kiilerich tests: add systematic test of merge ancestor calculation
Sun, 02 Mar 2014 18:25:19 +0100 Mads Kiilerich tests: add test case for criss cross merge
less more | rev 20642: (0) -10000 -3000 -1000 -300 -100 -30 -10 -7 +7 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip