diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-03-06 14:59:10 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-06 14:59:10 -0800 |
| commit | c6284da4ff4afbde8211efe5d03f3604b1c6b9d6 (patch) | |
| tree | 26cee58db0d1a6cdde43b36046f1cc8189cade37 /Documentation/merge-strategies.txt | |
| parent | Merge branch 'bw/perl-timegm-timelocal-fix' (diff) | |
| download | tgif-c6284da4ff4afbde8211efe5d03f3604b1c6b9d6.tar.xz | |
Seventh batch for 2.17
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions