| author | Vishal Verma <vishal@stellar.sh> |
|---|---|
| Fri, 24 May 2019 18:36:17 +0000 (12:36 -0600) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Tue, 28 May 2019 18:53:11 +0000 (11:53 -0700) | |
| commit | 1d14d0c...949c02260fe4f8b3a54a1b5c605823a2 |
| tree | ddafb00...d119393fe27fd594541f757a0fb46270 (tree) |
| parent | aeb582a...8374c094361cba1bd756dc6307432c42 (diff) |
| Documentation/merge-options.txt | diff | blob | history | |
| builtin/merge.c | diff | blob | history | |
| t/t7600-merge.sh | diff | blob | history |