Merge branch 'am/status'
authorShawn O. Pearce <spearce@spearce.org>
Thu, 25 Sep 2008 16:32:49 +0000 (09:32 -0700)
committerShawn O. Pearce <spearce@spearce.org>
Thu, 25 Sep 2008 16:32:49 +0000 (09:32 -0700)
* am/status:
  wt-status: Teach how to discard changes in the working directory
  wt-status: Split header generation into three functions


Trivial merge