Mercurial
Mercurial
>
hg-stable
/ changelog
summary
|
shortlog
| changelog |
graph
|
tags
|
bookmarks
|
branches
|
files
|
help
(0)
-10000
-3000
-1000
-300
-100
-30
-10
-2
+2
+10
+30
+100
+300
+1000
+3000
+10000
tip
Find changesets by keywords (author, files, the commit message), revision number or hash, or
revset expression
.
Mon, 04 Aug 2014 16:50:15 -0700
mergetools: add a test for premerge --keep
changeset
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 04 Aug 2014 16:50:15 -0700] rev 22030
mergetools: add a test for premerge --keep It works! No surprise.
Mon, 04 Aug 2014 16:39:47 -0700
test-merge-tools: introduce a "revision 4" that merges with conflict
changeset
Pierre-Yves David <pierre-yves.david@fb.com> [Mon, 04 Aug 2014 16:39:47 -0700] rev 22029
test-merge-tools: introduce a "revision 4" that merges with conflict We need conflicts to test the premerge=keep configuration.
(0)
-10000
-3000
-1000
-300
-100
-30
-10
-2
+2
+10
+30
+100
+300
+1000
+3000
+10000
tip