branch | stable |
changeset 21174 | 7991df9d2f20 |
parent 21127 | 69402eb72115 |
child 21200 | a1381eea7c7d |
--- a/mercurial/commands.py Tue Apr 22 10:12:13 2014 -0300 +++ b/mercurial/commands.py Tue Apr 22 10:12:21 2014 -0300 @@ -4013,7 +4013,7 @@ recent changeset at the top. 'o' is a changeset, '@' is a working directory parent, 'x' is obsolete, and '+' represents a fork where the changeset from the lines below is a - parent of the 'o' merge on the same same line. + parent of the 'o' merge on the same line. .. note::