Mercurial > hg > pyhgsh

view tests/test-merge-revert.out @ 2307:5b3a3e35f084

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add section for configuration notes with initial note about the default editor
author Lee Cantey <lcantey@gmail.com>
date Thu, 18 May 2006 10:09:16 -0700
parents b2ae81a7df29
children
line wrap: on
line source

1:016807e6fdaf
0:eb43f19ff115
016807e6fdaf tip
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
eb43f19ff115
eb43f19ff115+
reverting file1
? file1.orig
eb43f19ff115
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
? file1.orig
016807e6fdaf tip
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
merging file1
0 files updated, 1 files merged, 0 files removed, 0 files unresolved
? file1.orig
016807e6fdaf tip
? file1.orig
016807e6fdaf tip
? file1.orig
016807e6fdaf tip
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
? file1.orig
016807e6fdaf tip