| author | Elijah Newren <newren@gmail.com> |
|---|---|
| Sun, 10 Apr 2016 06:13:40 +0000 (23:13 -0700) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Wed, 13 Apr 2016 01:33:59 +0000 (18:33 -0700) | |
| commit | 40d7194...b6a0dadb7873cce614992f1d71fcdfbd |
| tree | c980966...7617c63ff6df5a83fdbdf5ecdbd14134 (tree) |
| parent | ef7d362...d76fe210827698cba79c737906048191 (diff) |
| builtin/merge.c | diff | blob | history | |
| t/t7605-merge-resolve.sh | diff | blob | history |