Mercurial > hg > mercurial-crew-with-dirclash
annotate contrib/favicon.ico @ 1674:dee55c4a4963
abort when using 'update -m' and this is not a merge
add more testcases for updating with local changes
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Wed, 01 Feb 2006 08:46:24 +0100 |
parents | 0bf11906df28 |
children |
rev | line source |
---|---|
1277
0bf11906df28
Add a favicon.ico, small version of the main HG image.
Ollivier Robert <roberto@keltia.freenix.fr>
parents:
diff
changeset
|
1 (binary:image/vnd.microsoft.icon) |