diff tests/test-conflict.out @ 1040:35e883d1ff9b

Show number of new heads when doing a pull
author mpm@selenic.com
date Wed, 24 Aug 2005 18:42:42 -0700
parents 5a034646e472
children 7544700fd931
line wrap: on
line diff