diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-04-14 18:59:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-14 18:59:09 -0700 |
| commit | b8b4d93100651876299eabaf76248510e616fab3 (patch) | |
| tree | 6247c16bcd7640bba45ce89999e794697b34a685 /Documentation/git-merge-file.txt | |
| parent | Fourth batch for post 2.8 cycle (diff) | |
| parent | Prepare for 2.8.2 (diff) | |
| download | tgif-b8b4d93100651876299eabaf76248510e616fab3.tar.xz | |
Merge branch 'maint'
* maint:
Prepare for 2.8.2
Start preparing for 2.8.2
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions