| author | Junio C Hamano <gitster@pobox.com> |
|---|---|
| Thu, 24 Mar 2011 06:48:24 +0000 (23:48 -0700) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Thu, 24 Mar 2011 07:37:25 +0000 (00:37 -0700) | |
| commit | 93e535a...b78c9861eca3e9371d1c3e5173c0ab02 |
| tree | 1466d66...1b4ae358cc0fc4e141fd7dc368dcf472 (tree) |
| parent | c395c25...8642893dd1bb4be1fd124dd12f9b848c (diff) |
| Documentation/git-merge.txt | diff | blob | history | |
| Documentation/merge-config.txt | diff | blob | history | |
| builtin/merge.c | diff | blob | history |