{"thread":{"id":"1847","subject":"[PATCH] Fix series mismerge","startedAt":"2005-09-18T16:47:12Z","lastAt":"2005-09-18T16:47:12Z","messageCount":1,"participants":["Paolo 'Blaisorblade' Giarrusso"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"8780","messageId":"20050918164712.13735.86782.stgit@zion.home.lan","threadId":"1847","inReplyTo":null,"subject":"[PATCH] Fix series mismerge","fromName":"Paolo 'Blaisorblade' Giarrusso","fromEmail":"blaisorblade@yahoo.it","sentAt":"2005-09-18T16:47:12Z","receivedAt":"2005-09-18T16:47:12Z","isPatch":true,"sender":{"key":"blaisorblade@yahoo.it","avatar":null},"body":"From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>\n\nMismerge with my addition of -e. Sorry for not pulling that time.\n\nSigned-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>\n---\n\n stgit/commands/series.py |    4 ++--\n 1 files changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/stgit/commands/series.py b/stgit/commands/series.py\n--- a/stgit/commands/series.py\n+++ b/stgit/commands/series.py\n@@ -32,8 +32,8 @@ with a '+' and the unapplied ones with a\n prefixed with a '>'. Empty patches are prefixed with a '0'.\"\"\"\n \n options = [make_option('-b', '--branch',\n-                       help = 'use BRANCH instead of the default one')]\n-options = [make_option('-e', '--empty',\n+                       help = 'use BRANCH instead of the default one'),\n+           make_option('-e', '--empty',\n                        help = 'check whether patches are empty '\n                        '(much slower)',\n                        action = 'store_true') ]\n"}]}