Commit 83c5317a authored by Georgi Kodinov's avatar Georgi Kodinov

merged 5.0-bugteam -> 5.1-bugteam

parents 87eb2cb9 bb31fd59
...@@ -1496,6 +1496,9 @@ void show_diff(DYNAMIC_STRING* ds, ...@@ -1496,6 +1496,9 @@ void show_diff(DYNAMIC_STRING* ds,
/* determine if we have diff on Windows /* determine if we have diff on Windows
needs special processing due to return values needs special processing due to return values
on that OS on that OS
This test is only done on Windows since it's only needed there
in order to correctly detect non-availibility of 'diff', and
the way it's implemented does not work with default 'diff' on Solaris.
*/ */
#ifdef __WIN__ #ifdef __WIN__
have_diff = diff_check(); have_diff = diff_check();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment