tests/test-permissions.out

progress: use gerund (updating) for merge progress

checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 1 changesets, 1 total revisions
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
verify failed
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 1 changesets, 1 total revisions
commit failed
diff -r c1fab96507ef a
--- a/a
+++ b/a
@@ -1,1 +1,1 @@
-foo
+barber
M a
? dir/a
dir: Permission denied
M a