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

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