author | Thomas Gummerer <t.gummerer@gmail.com> | |
Wed, 11 Sep 2019 18:20:26 +0000 (19:20 +0100) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 20 Sep 2019 16:58:22 +0000 (09:58 -0700) | ||
commit | e080b34540296e4671b4d1110ba3c71b5224884a | |
tree | fef1853984885b16c1bbbf9e9295d5cfa40db5d2 | tree | snapshot |
parent | 22184497a36a90e541617a51de6671ca5948612c | commit | diff |
builtin/merge.c | diff | blob | blame | history |