view tests/test-merge3.out @ 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 91c56c427171
children
line wrap: on
line source

removing b
nothing changed