From 637480ca8b3557c346eb6b2eb690c09f2dc922a8 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Wed, 19 Oct 2016 18:29:09 +0100
Subject: dgit-maint-merge(7): Fix a typo "upsteram"

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---
 dgit-maint-merge.7.pod | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod
index 7391daf..f8e33b2 100644
--- 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
 
-- 
cgit v1.2.3