tests: fix a typo in `desc()` revset in test-merge-criss-cross.t
I was looking into fixing the broken behavior only to find out that we had a
typo in the commit message and merge was not performed.
from __future__ import absolute_import
from mercurial.i18n import _
from mercurial import (
hg,
registrar,
)
cmdtable = {}
command = registrar.command(cmdtable)
@command(b'getflogheads', [], b'path')
def getflogheads(ui, repo, path):
"""
Extension printing a remotefilelog's heads
Used for testing purpose
"""
dest = repo.ui.expandpath(b'default')
peer = hg.peer(repo, {}, dest)
flogheads = peer.x_rfl_getflogheads(path)
if flogheads:
for head in flogheads:
ui.write(head + b'\n')
else:
ui.write(_(b'EMPTY\n'))