| author | David Aguilar <davvid@gmail.com> |
|---|---|
| Fri, 10 Oct 2014 08:19:47 +0000 (01:19 -0700) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Wed, 15 Oct 2014 21:10:52 +0000 (14:10 -0700) | |
| commit | 9c66cd3...d0a70b2cf56589a4df2cf63814270635 |
| tree | ecd6698...4fc4031ea10c7120fc06a19d3aa275c2 (tree) |
| parent | 76ee96a...b6f75e7d1c01e68ade72194179aa512d (diff) |
| git-mergetool.sh | diff | blob | history |