Merge branch 'sm/mv-dry-run-update' into maint

author Junio C Hamano <gitster@pobox.com>

Thu, 22 Mar 2018 21:24:25 +0000 (14:24 -0700)

committer Junio C Hamano <gitster@pobox.com>

Thu, 22 Mar 2018 21:24:25 +0000 (14:24 -0700)
author Junio C Hamano <gitster@pobox.com>
Thu, 22 Mar 2018 21:24:25 +0000 (14:24 -0700)
committer Junio C Hamano <gitster@pobox.com>
Thu, 22 Mar 2018 21:24:25 +0000 (14:24 -0700)
diff --cc builtin/mv.c
Simple merge
diff --cc t/t7001-mv.sh
Simple merge
author	Junio C Hamano <gitster@pobox.com>
	Thu, 22 Mar 2018 21:24:25 +0000 (14:24 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Thu, 22 Mar 2018 21:24:25 +0000 (14:24 -0700)
		1	2
builtin/mv.c	patch \|	diff1 \|	diff2 \|	blob \| history
t/t7001-mv.sh	patch \|	diff1 \|	diff2 \|	blob \| history