merge with stable
authorMatt Mackall <mpm@selenic.com>
Fri, 05 Jun 2015 13:00:18 -0500
changeset 25449 c39640d26a4c
parent 25448 2bbfc2042d93 (current diff)
parent 25447 093d38165e5a (diff)
child 25450 7e36c3000ead
merge with stable
mercurial/crecord.py
--- a/mercurial/crecord.py	Thu Jun 04 22:10:32 2015 -0700
+++ b/mercurial/crecord.py	Fri Jun 05 13:00:18 2015 -0500
@@ -1335,7 +1335,7 @@
  right/left-arrow [l/h] : go to child item / parent item
  shift-left-arrow   [h] : go to parent header / fold selected header
                       f : fold / unfold item, hiding/revealing its children
-                      f : fold / unfold parent item and all of its ancestors
+                      F : fold / unfold parent item and all of its ancestors
                       m : edit / resume editing the commit message
                       e : edit the currently selected hunk
                       a : toggle amend mode (hg rev >= 2.2)
@@ -1550,7 +1550,7 @@
             self.toggleedit(test=test)
         elif keypressed in ["f"]:
             self.togglefolded()
-        elif keypressed in ["f"]:
+        elif keypressed in ["F"]:
             self.togglefolded(foldparent=True)
         elif keypressed in ["?"]:
             self.helpwindow()