view tests/test-merge2.out @ 11123:8dd69bee71da stable

convert/svn: tree conflicts no longer happen now we use memctx
author Patrick Mezard <pmezard@gmail.com>
date Sat, 01 May 2010 16:29:27 +0200
parents 4b0c9c674707
children
line wrap: on
line source

0 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
created new head
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
created new head