tests/test-merge5.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Tue, 22 Aug 2006 20:45:03 -0300
changeset 3010 494521a3f142
parent 2830 49988d9f0758
child 3580 41989e55fa37
permissions -rw-r--r--
Only read .hg/hgrc files from trusted users/groups The list of trusted users and groups is specified in the [trusted] section of a hgrc; the current user is always trusted; "*" can be used to trust all users/groups. Global hgrc files are always read. On Windows (and other systems that don't have the pwd and grp modules), all .hg/hgrc files are read.

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
removing b
abort: update spans branches, use 'hg merge' or 'hg update -C' to lose changes