| author | Jay Soffian <jaysoffian@gmail.com> |
|---|---|
| Sat, 8 Oct 2011 18:39:52 +0000 (14:39 -0400) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Wed, 12 Oct 2011 20:17:18 +0000 (13:17 -0700) | |
| commit | 66f4b98...d9a8218ad97b7b2f1604b205072dda62 |
| tree | be94cc4...5e014b0f932a6a1d46901961a23478d8 (tree) |
| parent | 703f05a...5835cff92b12c29aecf8d724c8c847e2 (diff) |
| Documentation/merge-options.txt | diff | blob | history | |
| builtin/merge.c | diff | blob | history | |
| t/t7600-merge.sh | diff | blob | history |