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, 30 Nov 2015 13:43:55 -0800
filemerge: add a 'leave unresolved' option to change/delete prompts
changeset
Siddharth Agarwal <sid0@fb.com> [Mon, 30 Nov 2015 13:43:55 -0800] rev 27163
filemerge: add a 'leave unresolved' option to change/delete prompts We're going to make this option the default in an upcoming patch.
Mon, 30 Nov 2015 11:17:18 -0800
filemerge: add a 'leave unresolved' option to regular prompts
changeset
Siddharth Agarwal <sid0@fb.com> [Mon, 30 Nov 2015 11:17:18 -0800] rev 27162
filemerge: add a 'leave unresolved' option to regular prompts 'Regular' here means anything that isn't a change/delete prompt. We'll add this option to change/delete prompts in a subsequent patch.
(0)
-10000
-3000
-1000
-300
-100
-30
-10
-2
+2
+10
+30
+100
+300
+1000
+3000
+10000
tip