Merge branch 'rs/merge-microcleanup'
authorJunio C Hamano <gitster@pobox.com>
Tue, 22 Aug 2017 17:29:14 +0000 (10:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Aug 2017 17:29:14 +0000 (10:29 -0700)
commite2a2a1d...acb43d8296baf155ae6ea0ec6e2f2b8d
treecdeb97b...5d8ffff4588948cabd31e9df135c3ba0copy hash to clipboard (tree)
parent2d68161...230a6a713ac0f4ad68c51cc856e83338copy hash to clipboard (diff)
parentde3ce21...edb4870b082fab18148f859d2b3c9ae2copy hash to clipboard (diff)
builtin/merge.c