[PATCH] transplant: use Oxford comma
timeless
timeless at mozdev.org
Wed Dec 9 06:15:17 UTC 2015
# HG changeset patch
# User timeless <timeless at mozdev.org>
# Date 1448911706 0
# Mon Nov 30 19:28:26 2015 +0000
# Node ID c41cb6d2b7dbd62b1033727f8606b8c09fc4aa88
# Parent 42aa0e570eaa364a622bc4443b0bcb79b1100a58
transplant: use Oxford comma
diff --git a/hgext/transplant.py b/hgext/transplant.py
--- a/hgext/transplant.py
+++ b/hgext/transplant.py
@@ -599,7 +599,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'):
More information about the Mercurial-devel
mailing list