Merge branch 'jc/merge-symlink-ours-theirs'
authorJunio C Hamano <gitster@pobox.com>
Tue, 23 Jan 2018 21:16:37 +0000 (13:16 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 23 Jan 2018 21:16:37 +0000 (13:16 -0800)
commit14b9d9a...0d2fc6fd81d7a392fc1cc951a9d9d115
tree1ca0e09...dde1dc240bb9051cccf1ae45c3cd6570copy hash to clipboard (tree)
parent0bbab7d...ab61b6aad217706e0879db561e1bdfaecopy hash to clipboard (diff)
parentfd48b46...747c275b3d014b3f14d60d9ac19d184acopy hash to clipboard (diff)
merge-recursive.c