Merge branch 'sm/mv-dry-run-update'
authorJunio C Hamano <gitster@pobox.com>
Tue, 6 Mar 2018 22:54:00 +0000 (14:54 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 6 Mar 2018 22:54:00 +0000 (14:54 -0800)
Code clean-up.

* sm/mv-dry-run-update:
mv: remove unneeded 'if (!show_only)'
t7001: add test case for --dry-run

1  2 
builtin/mv.c
t/t7001-mv.sh
diff --cc builtin/mv.c
Simple merge
diff --cc t/t7001-mv.sh
Simple merge