summaryrefslogtreecommitdiff
path: root/dgit-maint-merge.7.pod
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2016-10-19 19:51:58 -0700
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-10-20 20:07:36 +0100
commit78d88ae748be1bfed6420eed39cc4cd7b7b2870a (patch)
tree5182b35e1db1d46de5d3c54605e2f8e4a6967307 /dgit-maint-merge.7.pod
parente31362aa5853ada39b14be5bbdc46cbda58e20a6 (diff)
dgit-maint-merge(7): Tweak wording
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Diffstat (limited to 'dgit-maint-merge.7.pod')
-rw-r--r--dgit-maint-merge.7.pod2
1 files changed, 1 insertions, 1 deletions
diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod
index 71f701e..642b39e 100644
--- a/dgit-maint-merge.7.pod
+++ b/dgit-maint-merge.7.pod
@@ -194,7 +194,7 @@ changes to the upstream source:
The Debian packaging of foo is maintained using dgit. For the sake of
an efficient workflow, Debian modifications to the upstream source are
-squashed into a single patch, rather than a series of quilt patches.
+squashed into a single diff, rather than a series of quilt patches.
To obtain a patch queue for package version 1.2.3-1:
=over 4