| author | Junio C Hamano <gitster@pobox.com> |
|---|---|
| Tue, 20 Mar 2012 22:39:10 +0000 (15:39 -0700) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Tue, 20 Mar 2012 22:39:10 +0000 (15:39 -0700) | |
| commit | d387868...7d29621e85e8c5c061d1f50586db74e5 |
| tree | 0e94cb6...c9bd3615adf051107dd6ac071fa5b9c7 (tree) |
| parent | a460348...9ecce6872bff099f3d75589f4d38c00c (diff) |
| Documentation/merge-options.txt | diff | blob | history | |
| builtin/merge.c | diff | blob | history |