Mercurial > hg > mercurial-crew-with-dirclash
diff hgext/extdiff.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 | f145d04899d2 |
children | 49966b5ab16f |