diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-07-02 12:51:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-02 12:51:50 -0700 |
| commit | c2f7b1026e33e308782fcb1b60e3d7af107fdc18 (patch) | |
| tree | 8768ef958c9dea375afcada68df1d0f1ae6d59c3 /Documentation/git-merge-one-file.txt | |
| parent | Git 2.0.1 (diff) | |
| parent | t7300: repair filesystem permissions with test_when_finished (diff) | |
| download | tgif-c2f7b1026e33e308782fcb1b60e3d7af107fdc18.tar.xz | |
Merge branch 'maint-1.8.5' into maint
* maint-1.8.5:
t7300: repair filesystem permissions with test_when_finished
enums: remove trailing ',' after last item in enum
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions