diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-01-04 14:06:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-01-04 14:06:00 -0800 |
| commit | 833e48259e23aea76f3765d28d1b2200332301f7 (patch) | |
| tree | 83823e5eb365e058c5ded6ed5ccb1aabd5a47a16 /Documentation/git-merge-file.txt | |
| parent | Merge branch 'jk/pending-keep-tag-name' into maint (diff) | |
| download | tgif-833e48259e23aea76f3765d28d1b2200332301f7.tar.xz | |
Git 2.6.5
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-file.txt')
0 files changed, 0 insertions, 0 deletions