Mercurial > hg > mercurial-crew-with-dirclash
diff doc/hgmerge.1.txt @ 3829:676b75547d13
context: don't spuriously raise abort when a file goes missing.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 08 Dec 2006 13:14:57 -0600 |
parents | 345bac2bc4ec |
children | 63b9d2deed48 |