| author | Junio C Hamano <gitster@pobox.com> |
|---|---|
| Tue, 25 Mar 2014 18:08:23 +0000 (11:08 -0700) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Tue, 25 Mar 2014 18:08:23 +0000 (11:08 -0700) | |
| commit | 3e33860...a1c39429ebfe2542adf9011bd2c9aeba |
| tree | eac628f...199b0cf69f804bf74729ebce129da1a9 (tree) |
| parent | 0e8c092...3e87c548de006cdb6af035d42f845087 (diff) |
| parent | 3c3e6f5...45c5e661bc8c338e4e7a9252a14e429e (diff) |
| Documentation/merge-strategies.txt | diff1 | | diff2 | | blob | history |