view tests/test-merge2.out @ 1712:21dcf38e5d7d

Allow callers to pass in the dirstate lock in most localrepo.py funcs. This makes it possible to take the lock once and commit a large number of patches, without having to read and write the dirstate for each patch.
author mason@suse.com
date Thu, 09 Feb 2006 17:18:43 -0600
parents 5a034646e472
children b2ae81a7df29
line wrap: on
line source

adding b
adding b