Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with-dirty-index
authorJunio C Hamano <gitster@pobox.com>
Fri, 22 Dec 2017 20:48:38 +0000 (12:48 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 22 Dec 2017 20:48:38 +0000 (12:48 -0800)
commitb6825b5...8e8b58943511f2576475accf1593486e
treede8bc8a...fdf954c8870cb1a1d60f3d38b781d12fcopy hash to clipboard (tree)
parent936d1b9...9416a95f593bf81ccae8ac62cd83f279copy hash to clipboard (diff)
parent65170c0...d466b18364e0d2b6a360900c073b600fcopy hash to clipboard (diff)
builtin/am.c
cache.h
merge-recursive.c
merge.c