[PATCH 2 of 4] transplant: use Oxford comma
timeless
timeless at mozdev.org
Mon Dec 7 14:23:48 CST 2015
# HG changeset patch
# User timeless <timeless at mozdev.org>
# Date 1448911706 0
# Mon Nov 30 19:28:26 2015 +0000
# Node ID c6ffc4847ba2f260943c0cd3a9dbd058a080f266
# Parent 4eb33ce681a1ac1df40845145e336c5c39b7497a
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, nor revision '
'list provided'))
if opts.get('all'):
if not opts.get('branch'):
More information about the Mercurial-devel
mailing list