diff .hgignore @ 21843:92666a869ea4 stable

bookmarks: avoid deleting primary bookmarks on rebase Prior to this, doing "hg rebase -s @foo -d @" would delete @, which is obviously wrong: a primary bookmark should never be automatically deleted. This change blocks the deletion, but doesn't yet properly clean up the divergence: @ should replace @foo.
author Matt Mackall <mpm@selenic.com>
date Tue, 08 Jul 2014 14:45:55 -0500
parents ce5d711475a3
children a9e1ab2da30d
line wrap: on
line diff