Mercurial > hg
comparison tests/test-merge9.t @ 17144:71e36b3d2cc4 stable
update: mention how update can be used to cancel an uncommitted merge
author | Adrian Buehlmann <adrian@cadifra.com> |
---|---|
date | Tue, 10 Jul 2012 21:26:18 +0200 |
parents | 2371f4aea665 |
children | f2719b387380 |
comparison
equal
deleted
inserted
replaced
17143:c9e6c6ae4ea1 | 17144:71e36b3d2cc4 |
---|