diff mercurial/filemerge.py @ 42286:8988e640a8ac

commit: fix a typo ("form p1" -> "from p1") Differential Revision: https://phab.mercurial-scm.org/D6375
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 14 May 2019 16:40:49 -0700
parents a8ccd821b7d2
children 4764e8436b2a
line wrap: on
line diff