diff options
| author |  Michael Haggerty <mhagger@alum.mit.edu> | 2017-10-28 09:27:15 +0200 |
|---|---|---|
| committer | Michael Haggerty <mhagger@alum.mit.edu> | 2017-10-28 09:27:15 +0200 |
| commit | ff08e56cde739152a59a86f5aa996954a2ec0614 (patch) | |
| tree | 9c7bc94151c5a082377ecb438e66aea140924edb /Documentation/git-merge.txt | |
| parent | Hopefully final batch before 2.15 (diff) | |
| parent | refs/files-backend: convert static functions to object_id (diff) | |
| download | tgif-ff08e56cde739152a59a86f5aa996954a2ec0614.tar.xz | |
Merge branch 'bc/object-id' into base
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions