# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1448911706 0
# Node ID 84e85f461b7972325877cbeac34a44544fef86ac
# Parent  dcdf0a52ad362c719cad7f0f19fafa1111b061f4
transplant: use Oxford comma

diff -r dcdf0a52ad36 -r 84e85f461b79 hgext/transplant.py
--- 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'):