]>
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 6 Nov 2017 05:24:24 +0000 (14:24 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 6 Nov 2017 05:24:24 +0000 (14:24 +0900) | ||
| commit | fb4cd88ad47da361e5b1a93dde71c61b9dfa2cd2 | |
| tree | 4233d3847c9dfec1cebbed8f354741431fdfc57a | tree | snapshot | 
| parent | a1bf46ed9dfe67ce07f351e0fd9b9cfe68740d6c | commit | diff | 
| parent | 3a4d2c743750dbc3c8165f362c0a3c0d1c775c8a | commit | diff | 
| Documentation/git-merge.txt | diff1 | | diff2 | | blob | history | 
| Documentation/merge-options.txt | diff1 | | diff2 | | blob | history |