dgit-maint-merge(7): Fix a typo "upsteram"

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod
index 7391daf5995b33b0549f1dc5032eb8c57a77dcb3..f8e33b22efca328879a9836edc9b11a8ab0086f0 100644 (file)
--- a/dgit-maint-merge.7.pod
+++ b/dgit-maint-merge.7.pod
@@ -134,7 +134,7 @@ Now create I<debian/gbp.conf>:
 =over 4
 
     [DEFAULT]
-    upstream-branch = upsteram
+    upstream-branch = upstream
     debian-branch = master
     upstream-tag = %(version)s