/[cvs]/ccvs/src/difflib.c
ViewVC logotype

Diff of /ccvs/src/difflib.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.1.2.2 by dprice, Wed Nov 30 05:04:14 2005 UTC revision 1.1.2.3 by dprice, Thu Dec 1 01:48:59 2005 UTC
# Line 189  merge (const char *dlabel, const char *d Line 189  merge (const char *dlabel, const char *d
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
# Line 217  merge (const char *dlabel, const char *d Line 218  merge (const char *dlabel, const char *d
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      {      {

Legend:
Removed from v.1.1.2.2  
changed lines
  Added in v.1.1.2.3

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26