comparison tests/test-merge-local.t @ 45510:1f5c548f15e5

rebase: fix an inconsistent hyphenation in a debug message We used "rebasing on disk" but "rebasing in-memory". I believe the former is correct, so I used that. Differential Revision: https://phab.mercurial-scm.org/D9054
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 18 Sep 2020 10:04:02 -0700
parents 9e4f82bc2b0b
children 55c6ebd11cb9
comparison
equal deleted inserted replaced
45507:df87821081ee 45510:1f5c548f15e5