diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-12-02 18:30:12 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-02 18:30:12 (GMT) |
| commit | 0748494e866041034605aaf177f29a61bdc25951 (patch) | |
| tree | e48f6c091a7231ae0db5d643215df16c5bd7a8d9 /wt-status.h | |
| parent | c86485dd15d54fc6ff2cd0dda3b2a9faa4f2d66e (diff) | |
| parent | 28044baba6d268d91057398ffa041ee1b931a5e0 (diff) | |
| download | git-0748494e866041034605aaf177f29a61bdc25951.zip git-0748494e866041034605aaf177f29a61bdc25951.tar.gz git-0748494e866041034605aaf177f29a61bdc25951.tar.bz2 | |
Merge branch 'maint'
* maint:
Prepare for 1.6.5.4
merge: do not add standard message when message is given with -m option
Do not misidentify "git merge foo HEAD" as an old-style invocation
Conflicts:
RelNotes
Diffstat (limited to 'wt-status.h')
0 files changed, 0 insertions, 0 deletions