| author | Junio C Hamano <gitster@pobox.com> |
|---|---|
| Thu, 25 Jul 2019 21:27:10 +0000 (14:27 -0700) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Thu, 25 Jul 2019 21:27:10 +0000 (14:27 -0700) | |
| commit | 33f2790...cafd29b8551a290e566003b975807c61 |
| tree | 1fb01d5...3bc1847a14b4e21cb5cb0a010f9c84ae (tree) |
| parent | abbd504...8e1215933f83a458f2842f5a6e0a21ee (diff) |
| parent | 1d14d0c...949c02260fe4f8b3a54a1b5c605823a2 (diff) |
| Documentation/merge-options.txt | diff1 | | diff2 | | blob | history |
| builtin/merge.c | diff1 | | diff2 | | blob | history |
| t/t7600-merge.sh | diff1 | | diff2 | | blob | history |