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
.
Wed, 21 Apr 2010 12:02:51 -0500
give worst-case 'merge' merge-tool lowest priority
changeset
David Champion <dgc@uchicago.edu> [Wed, 21 Apr 2010 12:02:51 -0500] rev 11147
give worst-case 'merge' merge-tool lowest priority Another tool had -10 already. Since 'merge' is clearly a worst-case tool (internal), lowering to -100 ensures there's plenty of room for slightly better cases.
Wed, 21 Apr 2010 11:57:45 -0500
merge: tool.premerge=keep will leave premerge markers in $local
changeset
David Champion <dgc@uchicago.edu> [Wed, 21 Apr 2010 11:57:45 -0500] rev 11146
merge: tool.premerge=keep will leave premerge markers in $local
Tue, 11 May 2010 20:22:37 +0200
merge with mpm
changeset
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Tue, 11 May 2010 20:22:37 +0200] rev 11145
merge with mpm
(0)
-10000
-3000
-1000
-300
-100
-30
-10
-3
+3
+10
+30
+100
+300
+1000
+3000
+10000
+30000
tip