Mercurial > public > mercurial-scm > hg-stable

view tests/test-dispatch.py.out @ 48607:07069fcd9a6e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: work with `simplemerge.MergeInput` in `filemerge()` We currently pass around pairs of file context objects and labels between functions in the `filemerge` module. I plan to pass around `simplemerge.MergeInput` instead. This patch prepares for that by using the type internally in `filemerge.filemerge()`. Differential Revision: https://phab.mercurial-scm.org/D12017
author Martin von Zweigbergk <martinvonz@google.com>
date Thu, 20 Jan 2022 14:42:50 -0800
parents 6f9ac3cb0987
children
line wrap: on
line source

running: init test1
result: 0
running: add foo
result: 0
running: commit -m commit1 -d 2000-01-01 foo
result: 0
running: commit -m commit2 -d 2000-01-02 foo
result: 0
running: log -r 0
changeset:   0:0e4634943879
user:        test
date:        Sat Jan 01 00:00:00 2000 +0000
summary:     commit1

result: 0
running: log -r tip
changeset:   1:45589e459b2e
tag:         tip
user:        test
date:        Sun Jan 02 00:00:00 2000 +0000
summary:     commit2

result: 0