git.99rst.org / git.git / commit
| author | Junio C Hamano <redacted> | |
| Thu, 3 Apr 2014 20:39:03 +0000 (13:39 -0700) | ||
| committer | Junio C Hamano <redacted> | |
| Thu, 3 Apr 2014 20:39:03 +0000 (13:39 -0700) | ||
| commit | 38245956648c54d138efc7b95b450dc7203e2a2f | |
| tree | 7cd5d4ef84f71587cc35f3dade01b1340eba9943 | tree | snapshot |
| parent | 9c7d0cc62f10d4945e665614ca836a4a5c81593c | commit | diff |
| parent | 3c3e6f5645c5e661bc8c338e4e7a9252a14e429e | commit | diff |
| Documentation/merge-strategies.txt | diff1 | | diff2 | | blob | history |