| merger.c (11892) | merger.c (11894) |
|---|---|
| 1/* three-way file merge internals */ 2 3/* Copyright 1991, 1992, 1993, 1994, 1995 Paul Eggert 4 Distributed under license by the Free Software Foundation, Inc. 5 6This file is part of RCS. 7 8RCS is free software; you can redistribute it and/or modify --- 63 unchanged lines hidden (view full) --- 72 char *b[3]; 73 int s; 74#if !DIFF3_BIN 75 char const *d[2]; 76#endif 77 78 for (i=3; 0<=--i; ) 79 a[i] = normalize_arg(argv[i], &b[i]); | 1/* three-way file merge internals */ 2 3/* Copyright 1991, 1992, 1993, 1994, 1995 Paul Eggert 4 Distributed under license by the Free Software Foundation, Inc. 5 6This file is part of RCS. 7 8RCS is free software; you can redistribute it and/or modify --- 63 unchanged lines hidden (view full) --- 72 char *b[3]; 73 int s; 74#if !DIFF3_BIN 75 char const *d[2]; 76#endif 77 78 for (i=3; 0<=--i; ) 79 a[i] = normalize_arg(argv[i], &b[i]); |
| 80 | 80 |
| 81 if (!edarg) 82 edarg = "-E"; 83 84#if DIFF3_BIN 85 t = 0; 86 if (!tostdout) 87 t = maketemp(0); 88 s = run( --- 60 unchanged lines hidden --- | 81 if (!edarg) 82 edarg = "-E"; 83 84#if DIFF3_BIN 85 t = 0; 86 if (!tostdout) 87 t = maketemp(0); 88 s = run( --- 60 unchanged lines hidden --- |