diff tests/test-grep.out @ 2810:ca06d35af65e

Rename merge.allow -> merge.branchmerge
author Matt Mackall <mpm@selenic.com>
date Mon, 07 Aug 2006 23:53:04 -0500
parents fad2d091c74f
children 81f351c5264d
line wrap: on
line diff