tree 7bd1b054c424f07257d3bad65d995d2e88aad799
parent 0cb5a5676bd5a0a74e6a31731aea9413af7795b2
parent ff4c66885dbe58e87709eadeb18f7a45c5bc1c3a
author Shawn Pearce <sop@google.com> 1373648186 -0700
committer Shawn Pearce <sop@google.com> 1373648186 -0700

Merge branch 'stable-2.6' into stable-2.7

* stable-2.6:
  Clarify that file:regex over is:watched never works