Commit 9910148c authored by Georgi Kodinov's avatar Georgi Kodinov

automerge

parents 4f2949b8 f2809743
...@@ -1535,7 +1535,7 @@ void show_diff(DYNAMIC_STRING* ds, ...@@ -1535,7 +1535,7 @@ void show_diff(DYNAMIC_STRING* ds,
else else
diff_name = 0; diff_name = 0;
#else #else
diff_name = "diff"; // Otherwise always assume it's called diff diff_name = "diff"; /* Otherwise always assume it's called diff */
#endif #endif
if (diff_name) if (diff_name)
......
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