Merge branch 'mg/killed-merge' into maint
authorJunio C Hamano <gitster@pobox.com>
Sun, 10 Sep 2017 08:02:55 +0000 (17:02 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 10 Sep 2017 08:02:55 +0000 (17:02 +0900)
commit78ad094...3c0c87ae52573bbac2fa7e093152891d
tree6bb756e...eb4ff1dd98ab5e2b97b5e325bdd6e800copy hash to clipboard (tree)
parent648a50a...8ad3d6718899a30a438ff97b4bdda342copy hash to clipboard (diff)
parent9d89b35...26b54c3ba33371b184a1ba6e30f8f46fcopy hash to clipboard (diff)
builtin/merge.c