comparison tests/test-rebase-collapse.out @ 8744:6b675c781c6d

merge: simplify 'other deleted' case
author Matt Mackall <mpm@selenic.com>
date Mon, 08 Jun 2009 18:14:44 -0500
parents 45495d784ad6
children 49efeed49c94
comparison
equal deleted inserted replaced
8743:a8d5af707656 8744:6b675c781c6d