| author | Junio C Hamano <gitster@pobox.com> |
|---|---|
| Thu, 26 Mar 2015 05:00:48 +0000 (22:00 -0700) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Wed, 29 Apr 2015 20:54:40 +0000 (13:54 -0700) | |
| commit | b439165...ed96c8dd2881d5c9fcad39a07d8cb92a |
| tree | 1f45768...927dc54401f6e17bb5d7c79b65fa230e (tree) |
| parent | d45366e...aa922037e7e84c3f35924d2b1399a453 (diff) |
| Documentation/git-merge.txt | diff | blob | history | |
| builtin/merge.c | diff | blob | history |