comparison tests/test-merge-local.out @ 9440:cd67bfcfabbe

Merge qprev/qnext backout
author Matt Mackall <mpm@selenic.com>
date Mon, 14 Sep 2009 17:29:47 -0500
parents a964ab624385
children 6f1894d6a6b0
comparison
equal deleted inserted replaced
9438:b2f3b9c82ac0 9440:cd67bfcfabbe