Mercurial > hg
diff tests/test-convert-cvs-detectmerge.out @ 8744:6b675c781c6d
merge: simplify 'other deleted' case
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 08 Jun 2009 18:14:44 -0500 |
parents | 4e5bd9b97bb3 |
children | 56a5f80556f5 |
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 08 Jun 2009 18:14:44 -0500 |
parents | 4e5bd9b97bb3 |
children | 56a5f80556f5 |