log tests/failfilemerge.py @ 53042:cdd7bf612c7b stable tip

age author description
Thu, 03 Mar 2022 17:34:00 +0100 Gregory Szorc py2: remove simple from __future__ statements
Fri, 03 Dec 2021 22:45:35 -0800 Martin von Zweigbergk filemerge: inline `_filemerge()` into `filemerge()`
Fri, 03 Dec 2021 21:50:25 -0800 Martin von Zweigbergk tests: remove unnecessary explicit args from `failfilemerge.py`