annotate tests/test-permissions.out @ 1798:d610fe0e6893
hgmerge: do not use file with markers in tools merging themselves
This time I forgot about a crucial part of the logic change.
The patch makes kdiff3 and tkdiff useful again.
author |
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> |
date |
Thu, 23 Feb 2006 18:10:04 +0100 |
parents |
f0b13c019b04 |
children |
3053fc33f545 |
rev |
line source |
1497
|
1 checking changesets
|
|
2 checking manifests
|
|
3 crosschecking files in changesets and manifests
|
|
4 checking files
|
|
5 1 files, 1 changesets, 1 total revisions
|
|
6 checking changesets
|
|
7 checking manifests
|
|
8 crosschecking files in changesets and manifests
|
|
9 checking files
|
|
10 verify failed
|
|
11 checking changesets
|
|
12 checking manifests
|
|
13 crosschecking files in changesets and manifests
|
|
14 checking files
|
|
15 1 files, 1 changesets, 1 total revisions
|
|
16 commit failed
|