comparison tests/test-merge5.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 0b89315d5de2
children 68a1b9d0663e
comparison
equal deleted inserted replaced
7639:ae7a614a6a57 7640:7197812e8d44