diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2008-09-25 18:32:49 +0200 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-09-25 18:32:49 +0200 |
| commit | 6ef1daf77202aee71056771d91dd12121c6061fd (patch) | |
| tree | cb25d90152aa22fdcf73e50c62cdc403c0d11666 /git-merge-resolve.sh | |
| parent | Merge branch 'pb/autocorrect-wrapper' (diff) | |
| parent | wt-status: Teach how to discard changes in the working directory (diff) | |
| download | git-6ef1daf77202aee71056771d91dd12121c6061fd.tar.xz git-6ef1daf77202aee71056771d91dd12121c6061fd.zip | |
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
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions