From: Junio C Hamano Date: Wed, 23 May 2018 05:38:23 +0000 (+0900) Subject: Merge branch 'em/status-rename-config' X-Git-Tag: v2.18.0-rc0~40 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1e174fdbe6b0bea58d20e451ca66a1bbb5829307 Merge branch 'em/status-rename-config' "git status" learned to pay attention to UI related diff configuration variables such as diff.renames. * em/status-rename-config: wt-status: use settings from git_diff_ui_config --- 1e174fdbe6b0bea58d20e451ca66a1bbb5829307