From: Shawn O. Pearce <spearce@spearce.org>
Date: Thu, 25 Sep 2008 16:32:49 +0000 (-0700)
Subject: Merge branch 'am/status'
X-Git-Tag: v1.6.1-rc1~204
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6ef1daf77202aee71056771d91dd12121c6061fd;p=git.git

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
---

6ef1daf77202aee71056771d91dd12121c6061fd