Mercurial > hg-stable

comparison tests/test-merge-criss-cross.t @ 25689:1cce81121472

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revset: fix a crash in parents() when 'wdir()' is in the set The crash was "TypeError: expected string or Unicode object, NoneType found" down in revlog.parentrevs(). This fixes heads() too (which is where I found it.)
author Matt Harbison <matt_harbison@yahoo.com>
date Mon, 29 Jun 2015 10:34:56 -0400
parents bd625cd4e5e7
children d8463a743d7d
comparison
equal deleted inserted replaced
25688:24cda1dd45ff 25689:1cce81121472