From: Sergey M․ <dstftw@gmail.com>
Date: Sat, 27 Jun 2015 08:26:51 +0000 (+0600)
Subject: [options] Add missing whitespace and split lines
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=00334d0de01d46165880569159c534f9b7d927a6;p=youtube-dl

[options] Add missing whitespace and split lines
---

diff --git a/youtube_dl/options.py b/youtube_dl/options.py
index 6aeca61ee..e7d067642 100644
--- a/youtube_dl/options.py
+++ b/youtube_dl/options.py
@@ -351,7 +351,8 @@ def parseOpts(overrideArguments=None):
         '--merge-output-format',
         action='store', dest='merge_output_format', metavar='FORMAT', default=None,
         help=(
-            'If a merge is required (e.g. bestvideo+bestaudio), output to given container format. One of mkv, mp4, ogg, webm, flv.'
+            'If a merge is required (e.g. bestvideo+bestaudio), '
+            'output to given container format. One of mkv, mp4, ogg, webm, flv. '
             'Ignored if no merge is required'))
 
     subtitles = optparse.OptionGroup(parser, 'Subtitle Options')