diff options
| author | Jean Delvare <khali@linux-fr.org> | 2005-09-04 12:12:02 +0000 |
|---|---|---|
| committer | Jean Delvare <khali@linux-fr.org> | 2005-09-04 12:12:02 +0000 |
| commit | be57f6248ee08bd3f49b5e44ad34989566400f0a (patch) | |
| tree | e622e5394e6676dcd9902b5ea16406db0335f7a8 /po/quilt.pot | |
| parent | 03604fffac0b6c5c01d504d1273e7fc2d9a4aac8 (diff) | |
| download | quilt-be57f6248ee08bd3f49b5e44ad34989566400f0a.tar.gz | |
- quilt/diff.in: Fix incorrect error message when incompatible options
are used. Fix direct call to awk.
Diffstat (limited to 'po/quilt.pot')
| -rw-r--r-- | po/quilt.pot | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/po/quilt.pot b/po/quilt.pot index 95e8797..4a7fc1f 100644 --- a/po/quilt.pot +++ b/po/quilt.pot @@ -212,7 +212,8 @@ msgid "" msgstr "" #: quilt/diff.in:231 -msgid "Options \\`-c patch', \\`--snapshot', and \\`-z' cannot be combined.\\n" +msgid "" +"Options \\`--combine', \\`--snapshot', and \\`-z' cannot be combined.\\n" msgstr "" #: quilt/diff.in:258 |