Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/ui.py @ 3200:e67c22bc8bba
merge: use repo.parents and parent contexts in update
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 29 Sep 2006 16:39:38 -0500 |
parents | 09e8aecd8016 |
children | 1b6d0fa84e0d |