view tests/test-resolve.out @ 9639:5384a22ab698

diffstat: print 0 instead of nothing for 0 adds or removes This is in line with how the stock diffstat behaves when processing a single diff with no line modifications (like a binary diff).
author Brodie Rao <me+hg@dackz.net>
date Sun, 25 Oct 2009 02:35:35 +0200
parents b2310903c462
children 51021f4c80b5
line wrap: on
line source

adding file
% create a second head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
% failing merge
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
% resolve -l, should be empty