annotate tests/test-permissions.out @ 1770:4eea6a747c27
hgmerge: fix diff+patch detection; cleanups
Details:
- actually show help message when no tools are found
- whitespace cleanup (stupid emacs)
- quote more variables
- simplify merge/diff3 error handling
author |
Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl> |
date |
Tue, 21 Feb 2006 15:48:09 -0600 |
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
|