Mercurial > hg > mercurial-crew-with-dirclash
diff doc/ja/hgmerge.1.ja.txt @ 3302:20087b4bc6f9
merge: don't call hooks for revert
- don't call hooks for revert
- use extra variables to avoid swapping contexts
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 09 Oct 2006 18:13:38 -0500 |
parents | 345bac2bc4ec |
children | 63b9d2deed48 |