| author | Junio C Hamano <gitster@pobox.com> |
|---|---|
| Thu, 21 Mar 2013 21:57:48 +0000 (22:57 +0100) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Thu, 21 Mar 2013 22:47:38 +0000 (15:47 -0700) | |
| commit | 77c7278...edfa5e3858423366fc91699724793b39 |
| tree | a99b3e5...d412ea5ddd2c4119d5c88d49d3dbabec (tree) |
| parent | 5d41784...efeafb6e109db7574196901c4e95d273 (diff) |
| Documentation/git-merge.txt | diff | blob | history | |
| Documentation/merge-options.txt | diff | blob | history |