comparison tests/test-merge-force.out @ 7640:7197812e8d44

error: move lock errors rename LockException to LockError
author Matt Mackall <mpm@selenic.com>
date Mon, 12 Jan 2009 11:09:14 -0600
parents 4b0c9c674707
children 3682a19bb637
comparison
equal deleted inserted replaced
7639:ae7a614a6a57 7640:7197812e8d44