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)
commit6ef1daf77202aee71056771d91dd12121c6061fd
treecb25d90152aa22fdcf73e50c62cdc403c0d11666
parentd22d53db6550d9acc773c3896869cba812f7afb5
parent4d6e4c4d34435c777bd844fe5ee0ec1ca06ffa4a
Merge branch 'am/status'

* am/status:
  wt-status: Teach how to discard changes in the working directory
  wt-status: Split header generation into three functions