Mercurial > hg > mercurial-crew-with-dirclash
diff doc/hgmerge.1.txt @ 1748:2428e6d66f06
bisect: fix for recent changes disallowing "false" merges
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Sun, 19 Feb 2006 18:59:20 +0100 |
parents | 3ab6e55ee361 |
children | 345bac2bc4ec |