comparison tests/test-pull-update.out @ 8744:6b675c781c6d

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