author | Chris Packham <judge.packham@gmail.com> | |
Wed, 14 Dec 2016 08:37:55 +0000 (21:37 +1300) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 14 Dec 2016 18:02:04 +0000 (10:02 -0800) | ||
commit | 367ff694281ce569edd8f6e444fc770f92f5d215 | |
tree | 98ee1a53650ff9ca13010879e0c8ac023549362c | tree | snapshot |
parent | 454cb6bd52a4de614a3633e4f547af03d5c3b640 | commit | diff |
Documentation/git-merge.txt | diff | blob | history | |
builtin/merge.c | diff | blob | history | |
t/t7600-merge.sh | diff | blob | history |