X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit-maint-merge.7.pod;fp=dgit-maint-merge.7.pod;h=fe48609ffaea1ff1c6fb4a420bd3e1960ef6e6f4;hb=d6291b24a8338eed8628a9da1eab2810652630e8;hp=995fe8b7e28b759aab09102ff98b297c98796607;hpb=303f60ed281bee140e59a11b043267d4ffc1a550;p=dgit.git

diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod
index 995fe8b7..fe48609f 100644
--- a/dgit-maint-merge.7.pod
+++ b/dgit-maint-merge.7.pod
@@ -146,6 +146,9 @@ Now create I<debian/gbp.conf>:
     pristine-tar = False
     pristine-tar-commit = False
 
+    [import-orig]
+    merge-mode = merge
+
 =back
 
 gbp-import-orig(1) requires a pre-existing upstream branch: