diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-04-14 18:58:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-14 18:58:11 -0700 |
| commit | 6a6636270fbaf74609cd3e1bd207dd2c420d640a (patch) | |
| tree | d6c115d0d37d3be903f155c57416819ee16d40bd /Documentation/merge-strategies.txt | |
| parent | Merge branch 'jv/merge-nothing-into-void' into maint (diff) | |
| download | tgif-6a6636270fbaf74609cd3e1bd207dd2c420d640a.tar.xz | |
Prepare for 2.8.2
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions