Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-merge-default.out @ 3302:20087b4bc6f9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 013921c753bd
children 9cd6578750b9
line wrap: on
line diff