Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-incoming-outgoing.out @ 2283:e506c14382fd
deprecate 'update -m'. use 'merge' instead.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Sun, 14 May 2006 21:07:34 -0700 |
parents | 99d6cae511f7 |
children | 9cceb439048b |