Mercurial > hg
view tests/test-permissions.out @ 6011:15a53af36a89
filemerge: two fixes for kdiff3 example configuration
author | Steve Borho <steve@borho.org> |
---|---|
date | Sun, 03 Feb 2008 22:27:53 -0600 |
parents | 3d1f9dcecdea |
children | 6f750e76fb46 |
line wrap: on
line source
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