Mercurial > hg
view contrib/favicon.ico @ 5206:6a1d2dd96b8e
abort when adding a file in merged state
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Tue, 21 Aug 2007 02:02:08 +0200 |
parents | 0bf11906df28 |
children |
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Tue, 21 Aug 2007 02:02:08 +0200 |
parents | 0bf11906df28 |
children |