Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-tags.out @ 1581:db10b7114de0
abort when merging two heads and repository has local changes
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Wed, 14 Dec 2005 22:19:03 -0600 |
parents | 6f274afc05c7 |
children | 7544700fd931 |
line wrap: on
line source
unknown acb14030fe0a tip acb14030fe0a21b60322c440ad2d20cf7685a376 first tip 1:b9154636be938d3d431e75a7c906504a079bfe07 first 0:acb14030fe0a21b60322c440ad2d20cf7685a376 b9154636be93 tip M a b9154636be93+ tip acb14030fe0a+ first acb14030fe0a21b60322c440ad2d20cf7685a376+ first M a c8edf04160c7 tip c8edf04160c7+b9154636be93+ tip M .hgtags