# HG changeset patch # User Pulkit Goyal <7895pulkit@gmail.com> # Date 2020-09-30 09:39:25 # Node ID 64461b43a7bf1f729dab39e39f4c2f77a432e5ce # Parent d5407b2e7689c0526ff24bb1434818b8aa9b4fc4 tests: add newfilenode test case in test-merge-changedelete.t diff --git a/tests/test-merge-changedelete.t b/tests/test-merge-changedelete.t --- a/tests/test-merge-changedelete.t +++ b/tests/test-merge-changedelete.t @@ -1,3 +1,15 @@ +#testcases newfilenode old + +#if newfilenode +Enable the config option +------------------------ + + $ cat >> $HGRCPATH < [experimental] + > merge-track-salvaged = True + > EOF +#endif + Tests for change/delete conflicts, including: b5605d88dc27: Make ui.prompt repeat on "unrecognized response" again (issue897)