Mercurial > public > mercurial-scm > python-hglib
comparison hglib/merge.py @ 104:6e423f7c784f
ancestor: fix incorrect reference to 'n2'
author | Francisco Figueirido <francisco@giantclam.net> |
---|---|
date | Thu, 01 Mar 2012 23:16:07 -0500 |
parents | ebcc5d7dd528 |
children | fe74d5599539 |
comparison
equal
deleted
inserted
replaced
103:e5d3b0aa48e6 | 104:6e423f7c784f |
---|