view tests/test-patch-offset.out @ 11716:db426935fa94 stable

progress: use gerund (updating) for merge progress
author timeless <timeless@gmail.com>
date Fri, 30 Jul 2010 10:32:24 +0300
parents 9a4034b630c4
children
line wrap: on
line source

% prepare repo
adding a
% import patch
applying patch from stdin
patching file a
Hunk #1 succeeded at 43 (offset 34 lines).
Hunk #2 succeeded at 87 (offset 34 lines).
Hunk #3 succeeded at 109 (offset 34 lines).
a
% compare imported changes against reference file