comparison tests/test-conflict.out @ 3656:e50891e461e4

Consolidate brinfo handling
author Matt Mackall <mpm@selenic.com>
date Wed, 15 Nov 2006 15:51:58 -0600
parents b2ae81a7df29
children 46280c004f22
comparison
equal deleted inserted replaced
3655:2801a3efc7c3 3656:e50891e461e4