comparison contrib/editmerge @ 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 612502900a2d
children
comparison
equal deleted inserted replaced
27455:a9a047878e14 27456:2337958596e3