# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1582742936 28800
# Node ID 0e5e192adb6f21a251cf1e46dbe22263de6a0df4
# Parent  a45ffad9ae98d545ba8f68e019511de2be6abaf6
tests: use new, use-case-specific methods from merge module

Differential Revision: https://phab.mercurial-scm.org/D8169

diff -r a45ffad9ae98 -r 0e5e192adb6f tests/test-revlog-ancestry.py
--- a/tests/test-revlog-ancestry.py	Wed Feb 26 10:40:31 2020 -0800
+++ b/tests/test-revlog-ancestry.py	Wed Feb 26 10:48:56 2020 -0800
@@ -25,11 +25,11 @@
 
 
 def update(rev):
-    merge.update(repo, rev, branchmerge=False, force=True)
+    merge.clean_update(repo[rev])
 
 
 def merge_(rev):
-    merge.update(repo, rev, branchmerge=True, force=False)
+    merge.merge(repo[rev])
 
 
 if __name__ == '__main__':