| author | Martin Ågren <martin.agren@gmail.com> |
|---|---|
| Wed, 28 Feb 2018 19:07:57 +0000 (20:07 +0100) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Wed, 28 Feb 2018 19:15:51 +0000 (11:15 -0800) | |
| commit | 5790d25...81a60a1c3a780e997a59774e48c2c026 |
| tree | 012c51b...d3eb8fef81294f69d363151181c82b53 (tree) |
| parent | 51d3f43...2fd7f93cd19494eef4aef712fad597c2 (diff) |
| merge.c | diff | blob | history |