Hi Chris,
On Sun, 24 Apr 2016, Christian Couder wrote:
[...]
/*
* If we are allowed to fall back on 3-way merge, don't give false
* errors during the initial attempt.
*/
+
if (state->threeway && !index_file) {
- cp.no_stdout = 1;
- cp.no_stderr = 1;
+ save_stdout_fd = dup(1);
+ dup_devnull(1);
+ save_stderr_fd = dup(2);
+ dup_devnull(2);
I wonder. It should be possible to teach the apply function to be quiet by
default, yes? That would be more elegant than dup()ing back and forth.
Ciao,
Dscho