version 1.47, 2006/08/01 05:14:17 |
version 1.48, 2006/08/11 08:18:19 |
|
|
|
|
while ((ch = rcs_getopt(argc, argv, "AEek:p::q::r::TVx::z:")) != -1) { |
while ((ch = rcs_getopt(argc, argv, "AEek:p::q::r::TVx::z:")) != -1) { |
switch (ch) { |
switch (ch) { |
case 'A': case 'E': case 'e': |
case 'A': |
|
/* |
|
* kept for compatibility |
|
*/ |
break; |
break; |
|
case 'E': |
|
flags |= MERGE_EFLAG; |
|
flags |= MERGE_OFLAG; |
|
break; |
|
case 'e': |
|
flags |= MERGE_EFLAG; |
|
break; |
case 'k': |
case 'k': |
kflag = rcs_kflag_get(rcs_optarg); |
kflag = rcs_kflag_get(rcs_optarg); |
if (RCS_KWEXP_INVAL(kflag)) { |
if (RCS_KWEXP_INVAL(kflag)) { |
|
|
if (rcsnum_cmp(rev1, rev2, 0) == 0) |
if (rcsnum_cmp(rev1, rev2, 0) == 0) |
goto out; |
goto out; |
|
|
if ((bp = rcs_diff3(file, argv[0], rev1, rev2, |
if ((bp = rcs_diff3(file, argv[0], rev1, rev2, flags)) == NULL) |
!(flags & QUIET))) == NULL) |
|
errx(D_ERROR, "failed to merge"); |
errx(D_ERROR, "failed to merge"); |
|
|
if (!(flags & QUIET)) { |
if (!(flags & QUIET)) { |