diff tests/test-merge-default.t @ 34036:fe04c018eaac

filemerge: add _restorebackup Differential Revision: https://phab.mercurial-scm.org/D404
author Phil Cohen <phillco@fb.com>
date Thu, 31 Aug 2017 11:28:59 -0700
parents 9e0d222f5687
children 10c5eacd793f
line wrap: on
line diff