Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Add -y/--no-prompt option to mergetool
[gitweb.git]
/
wt-status.c
diff --git
a/wt-status.c
b/wt-status.c
index 54d2f586938d121bf49a7640883e1e525009589c..6a7645ed86fd5879e959460011a8add015d392d9 100644
(file)
--- a/
wt-status.c
+++ b/
wt-status.c
@@
-301,6
+301,7
@@
static void wt_status_print_verbose(struct wt_status *s)
setup_revisions(0, NULL, &rev, s->reference);
rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
rev.diffopt.detect_rename = 1;
+ DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV);
rev.diffopt.file = s->fp;
rev.diffopt.close_file = 0;
/*