Mercurial > hg

comparison tests/test-merge5.t @ 17394:19e4861f9730 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 610873cf064a
children 6da47b655d97
comparison
equal deleted inserted replaced
17392:bdd248666dbc 17394:19e4861f9730