From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Sun, 24 Mar 2019 08:20:11 +0000 (+0700)
Subject: diff.c: allow --no-color-moved-ws
X-Git-Tag: v2.22.0-rc0~71^2~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/bb9872904e032f28e4ac9d2438c4daba9eae9d05?hp=bb9872904e032f28e4ac9d2438c4daba9eae9d05

diff.c: allow --no-color-moved-ws

This option is added in commit b73bcbac4a (diff: allow
--no-color-moved-ws - 2018-11-23) in pw/diff-color-moved-ws-fix. To ease
merge conflict resolution, re-implement the option handling here so that
the conflict could be resolved by taking this side of change.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---