| author | Johannes Schindelin <johannes.schindelin@gmx.de> |
|---|---|
| Fri, 9 Sep 2016 14:38:00 +0000 (16:38 +0200) | |
| committer | Junio C Hamano <gitster@pobox.com> |
| Fri, 9 Sep 2016 18:24:52 +0000 (11:24 -0700) | |
| commit | 55f5704...a69d3e6836620f01bee0093ad5e331e8 |
| tree | 188cea6...8a5d07058b7f8949eaf6024e4e5ab476 (tree) |
| parent | 0e408fc...47088aa54f97cada3b880afd2560cc94 (diff) |
| merge.c | diff | blob | history |