Mercurial > hg
diff tests/test-transplant.out @ 6952:3fffba1c87d0
i18n: avoid naive plural tricks
| author | Martin Geisler <mg@daimi.au.dk> |
|---|---|
| date | Sun, 31 Aug 2008 16:12:02 +0200 |
| parents | 6334569c8caa |
| children | d3fb413667e5 |
line wrap: on
line diff
--- a/tests/test-transplant.out Sun Aug 31 12:05:29 2008 +0200 +++ b/tests/test-transplant.out Sun Aug 31 16:12:02 2008 +0200 @@ -110,14 +110,14 @@ applying a1e30dd1b8e7 patching file foo Hunk #1 FAILED at 0 -1 out of 1 hunk FAILED -- saving rejects to file foo.rej +1 out of 1 hunks FAILED -- saving rejects to file foo.rej patch failed to apply abort: Fix up the merge and run hg transplant --continue 1 files updated, 0 files merged, 1 files removed, 0 files unresolved applying a1e30dd1b8e7 patching file foo Hunk #1 FAILED at 0 -1 out of 1 hunk FAILED -- saving rejects to file foo.rej +1 out of 1 hunks FAILED -- saving rejects to file foo.rej patch failed to apply abort: Fix up the merge and run hg transplant --continue a1e30dd1b8e7 transplanted as f1563cf27039