view tests/test-merge2.out @ 2619:fc0ec2b64150

update test-backout.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Sat, 15 Jul 2006 09:19:40 -0700
parents b2ae81a7df29
children 4b0c9c674707
line wrap: on
line source

0 files updated, 0 files merged, 0 files removed, 0 files unresolved
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
adding b