view tests/test-merge2.out @ 5814:dd5a501cb97f

restore branch after rollback (issue 902)
author Alexandre Vassalotti <mercurial-bugs@selenic.com>
date Mon, 07 Jan 2008 15:26:12 -0600
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