commit | a01f7f2ba0e73ffbee0fa1ec9a5a78f276cc173d | |
author | Felipe Contreras <felipe.contreras@gmail.com> | |
Mon, 21 Apr 2014 00:17:33 +0000 (20 19:17 -0500) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Tue, 22 Apr 2014 19:53:59 +0000 (22 12:53 -0700) | ||
tree | 85511431579f68ce408f37e6cc35a6e1fe154876 | treesnapshot (tar.gz zip) |
parent | 779792a5f24bb4e8049c4f88ad752e70d4a8a080 | commitdiff |
Documentation/git-merge.txt | diffblobblamehistory | |
builtin/merge.c | diffblobblamehistory |