189 |
{ |
{ |
190 |
char *diffout; |
char *diffout; |
191 |
int retval; |
int retval; |
192 |
|
bool save_noexec; |
193 |
|
|
194 |
/* Remember that the first word in the `call_diff_setup' string is used |
/* Remember that the first word in the `call_diff_setup' string is used |
195 |
now only for diagnostic messages -- CVS no longer forks to run |
now only for diagnostic messages -- CVS no longer forks to run |
218 |
else if (retval == 2) |
else if (retval == 2) |
219 |
error (1, 0, "diff3 failed."); |
error (1, 0, "diff3 failed."); |
220 |
|
|
221 |
|
save_noexec = noexec; |
222 |
|
noexec = false; |
223 |
copy_file (diffout, dest); |
copy_file (diffout, dest); |
224 |
|
noexec = save_noexec; |
225 |
|
|
226 |
/* Clean up. */ |
/* Clean up. */ |
227 |
{ |
{ |