view tests/test-merge3.out @ 1114:58371c4c2c8f

Remove the lock file copied during clone (was the source lock file) Index: hg/mercurial/commands.py ===================================================================
author Stephen Darnell
date Sat, 27 Aug 2005 19:15:02 -0700
parents 5a034646e472
children 91c56c427171
line wrap: on
line source

removing b
b never committed!
nothing changed