view tests/test-hup.out @ 3118:7a635ef25132

merge: simplify tests for local changed/remote deleted
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 20:18:27 -0500
parents b72562060e45
children 8ae88ed2a3b6
line wrap: on
line source

0
0
adding changesets
killed!
transaction abort!
rollback completed
00changelog.i
data
journal.dirstate