diff tests/test-import-merge.t @ 27456:2337958596e3

rebase: simplify documentation about --keep Also include a warning about bookmarks
author timeless <timeless@mozdev.org>
date Fri, 18 Dec 2015 18:22:03 +0000
parents bdc0e04df243
children eb586ed5d8ce
line wrap: on
line diff