diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-11-21 05:11:40 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-21 05:11:40 (GMT) |
| commit | 14c63a9dc093d6738454f6369a4f5663ca732cf7 (patch) | |
| tree | 285523c98a6e9ec57cd401717627bec71a354147 /Documentation/merge-strategies.txt | |
| parent | 719c7020abab6358df891b425684777e719cfa7b (diff) | |
| parent | 95a731ce92c7576d927f0d8a9b27c206cb58c2e6 (diff) | |
| download | git-14c63a9dc093d6738454f6369a4f5663ca732cf7.zip git-14c63a9dc093d6738454f6369a4f5663ca732cf7.tar.gz git-14c63a9dc093d6738454f6369a4f5663ca732cf7.tar.bz2 | |
Sync with maint
* maint:
Almost ready for 2.15.1
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions