diff tests/test-merge-default.out @ 11378:cb21fb1b55ba

bookmarks: add support for pull --bookmark to import remote bookmarks
author Matt Mackall <mpm@selenic.com>
date Thu, 17 Jun 2010 14:26:23 -0500
parents 5b48d819d5f9
children
line wrap: on
line diff