commit | 3e33860aa1c39429ebfe2542adf9011bd2c9aeba | |
author | Junio C Hamano <gitster@pobox.com> | |
Tue, 25 Mar 2014 18:08:23 +0000 (25 11:08 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Tue, 25 Mar 2014 18:08:23 +0000 (25 11:08 -0700) | ||
tree | eac628f0199b0cf69f804bf74729ebce129da1a9 | treesnapshot (tar.gz zip) |
parent | 0e8c09263e87c548de006cdb6af035d42f845087 | commitdiff |
parent | 3c3e6f5645c5e661bc8c338e4e7a9252a14e429e | commitdiff |
Documentation/merge-strategies.txt | diff1 | diff2 | blobhistory |