| author | David Aguilar <davvid@gmail.com> |
|---|---|
| Fri, 7 Oct 2016 23:58:03 +0000 (16:58 -0700) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Tue, 11 Oct 2016 17:04:10 +0000 (10:04 -0700) | |
| commit | 8827b3a...873ebfad79b324d6134c1ec4bbea5f06 |
| tree | 31724d7...861948e6c06b53c9f16189a503092518 (tree) |
| parent | a23ca1b...dc42ffd4de2ef30d67ce1e21ded29886 (diff) |
| git-mergetool.sh | diff | blob | history |