diff tests/test-merge8.t @ 13366:c756e9166417

bookmarks: merge incoming/outgoing into core
author Matt Mackall <mpm@selenic.com>
date Thu, 10 Feb 2011 13:46:28 -0600
parents 518b90d66fad
children f2719b387380
line wrap: on
line diff