Mercurial > hg
comparison mercurial/ui.py @ 20943:003cb972178d
merge: include ancestor node in merge actions
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Fri, 28 Feb 2014 02:38:33 +0100 |
parents | f144928dd058 |
children | 350dc24a553d |
comparison
equal
deleted
inserted
replaced
20942:3737e653dcbe | 20943:003cb972178d |
---|