Mercurial > hg > mercurial-crew-with-dirclash
diff Makefile @ 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 | e84c69b43cdb |
children | 8a2a7f7d9df6 |