| author | Junio C Hamano <gitster@pobox.com> |
|---|---|
| Thu, 3 Apr 2014 20:39:03 +0000 (13:39 -0700) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Thu, 3 Apr 2014 20:39:03 +0000 (13:39 -0700) | |
| commit | 3824595...648c54d138efc7b95b450dc7203e2a2f |
| tree | 7cd5d4e...84f71587cc35f3dade01b1340eba9943 (tree) |
| parent | 9c7d0cc...2f10d4945e665614ca836a4a5c81593c (diff) |
| parent | 3c3e6f5...45c5e661bc8c338e4e7a9252a14e429e (diff) |
| Documentation/merge-strategies.txt | diff1 | | diff2 | | blob | history |