changeset 27322:84e85f461b79

transplant: use Oxford comma
author timeless <timeless@mozdev.org>
date Mon, 30 Nov 2015 19:28:26 +0000
parents dcdf0a52ad36
children 0fe93498ef07
files hgext/transplant.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/transplant.py	Wed Dec 09 17:01:27 2015 -0800
+++ b/hgext/transplant.py	Mon Nov 30 19:28:26 2015 +0000
@@ -607,7 +607,7 @@
             return
         if not (opts.get('source') or revs or
                 opts.get('merge') or opts.get('branch')):
-            raise error.Abort(_('no source URL, branch revision or revision '
+            raise error.Abort(_('no source URL, branch revision, or revision '
                                'list provided'))
         if opts.get('all'):
             if not opts.get('branch'):