view tests/test-1102.out @ 8744:6b675c781c6d

merge: simplify 'other deleted' case
author Matt Mackall <mpm@selenic.com>
date Mon, 08 Jun 2009 18:14:44 -0500
parents 938eddd76237
children
line wrap: on
line source

adding a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
tip                                3:a49829c4fc11
t1                                 0:f7b1eb17ad24