diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-02-05 19:38:58 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-05 19:38:58 -0800 |
| commit | 919ab6429aab9af44feea0768feef80f3092e9d3 (patch) | |
| tree | 34a6e799b49b5c4b3f3f00a3e86148e8af203c72 /Documentation/git-merge.txt | |
| parent | Merge branch 'jc/maint-apply-fix' into maint (diff) | |
| parent | Fixed broken git help -w when installing from RPM (diff) | |
| download | tgif-919ab6429aab9af44feea0768feef80f3092e9d3.tar.xz | |
Merge branch 'maint-1.6.0' into maint
* maint-1.6.0:
Fixed broken git help -w when installing from RPM
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions