diff .hgignore @ 17394:19e4861f9730 stable

tests: merging bookmarked heads 45b5eb2941d0 fixed an error that occured when heads being merged were both inactive bookmarks. Add a test for that case.
author John Li <jli@circularly.org>
date Mon, 27 Aug 2012 09:57:58 -0400
parents 2426ec322cd1
children 93d97a212559
line wrap: on
line diff