diff mercurial/subrepo.py @ 21268:a0b8a912ec81

merge: simplify mergestate iter
author Mads Kiilerich <mads@kiilerich.com>
date Sun, 13 May 2012 17:45:08 +0200
parents a2cc3c08c3ac
children 78a60daacea8 2e91d4964ecd
line wrap: on
line diff