Mercurial > hg > mercurial-crew-with-dirclash
diff doc/hgmerge.1.txt @ 3240:8d4855fd9d7b
merge: use new working context object in update
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 03 Oct 2006 01:21:46 -0500 |
parents | 345bac2bc4ec |
children | 63b9d2deed48 |