Sam James <sam@xxxxxxxxxx> writes: > ping - let me know if I need to do anything different. Thanks! > >>> >>> >>>> Documentation/config/diff.txt | 8 +++++--- >>>> Documentation/config/status.txt | 4 +++- >>>> diff.c | 14 +++++++++++--- >>>> diff.h | 1 + >>>> diffcore-rename.c | 6 ++++-- >>>> merge-ort.c | 2 +- >>>> merge-recursive.c | 2 +- >>>> 7 files changed, 26 insertions(+), 11 deletions(-) Copies-harder is supported from the command line already. We do not want a configuration variable for it. diff.renames configuration was already a mistake enough. Let's not pile on a new mistake on an old mistake that it is too late for us to take back. Thanks.