--- a/tests/test-merge4.t Fri Jan 10 17:46:10 2020 -0800
+++ b/tests/test-merge4.t Wed Jan 29 11:30:35 2020 -0800
@@ -23,3 +23,37 @@
abort: cannot commit merge with missing files
[255]
+
+Test conflict*() revsets
+
+# Bad usage
+ $ hg log -r 'conflictlocal(foo)'
+ hg: parse error: conflictlocal takes no arguments
+ [255]
+ $ hg log -r 'conflictother(foo)'
+ hg: parse error: conflictother takes no arguments
+ [255]
+ $ hg co -C .
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+# No merge parents when not merging
+ $ hg log -r 'conflictlocal() + conflictother()'
+# No merge parents when there is no conflict
+ $ hg merge 1
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ (branch merge, don't forget to commit)
+ $ hg log -r 'conflictlocal() + conflictother()'
+ $ hg co -C .
+ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+ $ echo conflict > b
+ $ hg ci -Aqm 'conflicting change to b'
+ $ hg merge 1
+ merging b
+ warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
+ 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
+ use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
+ [1]
+# Shows merge parents when there is a conflict
+ $ hg log -r 'conflictlocal()' -T '{rev} {desc}\n'
+ 3 conflicting change to b
+ $ hg log -r 'conflictother()' -T '{rev} {desc}\n'
+ 1 commit #1