diff options
Diffstat (limited to 'docs/manpages/gbp-import-orig.xml')
| -rw-r--r-- | docs/manpages/gbp-import-orig.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/manpages/gbp-import-orig.xml b/docs/manpages/gbp-import-orig.xml index 04db197e..7eccf6aa 100644 --- a/docs/manpages/gbp-import-orig.xml +++ b/docs/manpages/gbp-import-orig.xml @@ -142,7 +142,7 @@ identical to the newly imported tree but preserves the content of the <filename>debian/</filename> directory while keeping the current head as well as the newly - important trees as parents of the generated commit. This is + imported tree as parents of the generated commit. This is similar to a <option>theirs</option> merge strategy while preserving <filename>debian/</filename>. </para> |