version 1.21, 2007/06/27 04:29:40 |
version 1.22, 2007/06/28 02:14:41 |
|
|
break; |
break; |
|
|
case 'l': |
case 'l': |
|
case '1': |
/* Choose left column as-is. */ |
/* Choose left column as-is. */ |
if (s1 != NULL) |
if (s1 != NULL) |
fprintf(outfile, "%s\n", s1); |
fprintf(outfile, "%s\n", s1); |
|
|
goto QUIT; |
goto QUIT; |
|
|
case 'r': |
case 'r': |
|
case '2': |
/* Choose right column as-is. */ |
/* Choose right column as-is. */ |
if (s2 != NULL) |
if (s2 != NULL) |
fprintf(outfile, "%s\n", s2); |
fprintf(outfile, "%s\n", s2); |
|
|
"eb:\tedit both diffs concatenated\n" |
"eb:\tedit both diffs concatenated\n" |
"el:\tedit left diff\n" |
"el:\tedit left diff\n" |
"er:\tedit right diff\n" |
"er:\tedit right diff\n" |
"l:\tchoose left diff\n" |
"l | 1:\tchoose left diff\n" |
"r:\tchoose right diff\n" |
"r | 2:\tchoose right diff\n" |
"s:\tsilent mode--don't print identical lines\n" |
"s:\tsilent mode--don't print identical lines\n" |
"v:\tverbose mode--print identical lines\n" |
"v:\tverbose mode--print identical lines\n" |
"q:\tquit"); |
"q:\tquit"); |