projects / git / commit
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 3 Jul 2013 22:36:30 +0000 (15:36 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 3 Jul 2013 22:36:30 +0000 (15:36 -0700) | ||
| commit | 15afe9596c101d00085830c54fdc4c4ad0b7193e | |
| tree | 355012e6a3d7a8b3c1c69b3f1ae2c1708ba4dbb0 | tree | snapshot |
| parent | c9d9a2d6b60178d604a2b78886b031d250980e9f | commit | diff |
| parent | 66fa1b2c354f79ed48f5986ee700ccb2d167ccbf | commit | diff |
| Documentation/merge-options.txt | diff1 | | diff2 | | blob | history |