Mercurial > hg
comparison tests/test-merge-revert.out @ 3400:d2b55e3c4e25
merge: if filemerge skips merge, report as updated
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 15 Oct 2006 16:18:09 -0500 |
parents | 966632304dde |
children | 4c94b6d0fb1c |
comparison
equal
deleted
inserted
replaced
3399:5dbb3a991bbf | 3400:d2b55e3c4e25 |
---|---|
9 eb43f19ff115 | 9 eb43f19ff115 |
10 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 10 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
11 ? file1.orig | 11 ? file1.orig |
12 016807e6fdaf tip | 12 016807e6fdaf tip |
13 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 13 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
14 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | 14 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
15 ? file1.orig | 15 ? file1.orig |
16 016807e6fdaf tip | 16 016807e6fdaf tip |
17 ? file1.orig | 17 ? file1.orig |
18 016807e6fdaf tip | 18 016807e6fdaf tip |
19 ? file1.orig | 19 ? file1.orig |