Mercurial > hg
changeset 20635:7cd956ace1f4
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 03 Mar 2014 15:34:09 -0600 |
parents | f2bb7ba59456 (current diff) 2d183dd54384 (diff) |
children | 12580e04cc43 |
files | mercurial/commands.py |
diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Mon Mar 03 12:54:46 2014 -0800 +++ b/mercurial/commands.py Mon Mar 03 15:34:09 2014 -0600 @@ -4468,7 +4468,7 @@ public < draft < secret - Return 0 on success, 1 if no phases were changed or some could not + Returns 0 on success, 1 if no phases were changed or some could not be changed. """ # search for a unique phase argument
--- a/mercurial/templates/static/style-paper.css Mon Mar 03 12:54:46 2014 -0800 +++ b/mercurial/templates/static/style-paper.css Mon Mar 03 15:34:09 2014 -0600 @@ -168,7 +168,7 @@ h2 { font-size: 120%; border-bottom: 1px solid #999; } h2 a { color: #000; } h3 { - margin-top: -.7em; + margin-top: +.7em; font-size: 100%; }