Merge branch 'sb/diff-color-move-more'
authorJunio C Hamano <gitster@pobox.com>
Mon, 24 Sep 2018 17:30:48 +0000 (10:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 24 Sep 2018 17:30:48 +0000 (10:30 -0700)
Bugfix.

* sb/diff-color-move-more:
diff: fix --color-moved-ws=allow-indentation-change

1  2 
diff.c
diff --cc diff.c
Simple merge