--- /usr/src/usr.bin/sdiff/sdiff.c	Sun Apr 22 06:52:20 2007
+++ sdiff.c	Thu Jun 21 10:52:52 2007
@@ -1,4 +1,5 @@
 /*	$OpenBSD: sdiff.c,v 1.20 2006/09/19 05:52:23 otto Exp $ */
+/*	$FreeBSD$ */
 
 /*
  * Written by Raymond Lai <ray@cyth.net>.
@@ -84,6 +85,7 @@
 	{ "expand-tabs",		no_argument,		NULL,	't' },
 	{ "ignore-all-space",		no_argument,		NULL,	'W' },
 	{ "width",			required_argument,	NULL,	'w' },
+	{ "ignore-case",		no_argument,		NULL,	'i' },
 	{ NULL,				0,			NULL,	 0  }
 };
 
@@ -435,6 +437,7 @@
 			break;
 
 		case 'l':
+		case '1':
 			/* Choose left column as-is. */
 			if (s1 != NULL)
 				fprintf(outfile, "%s\n", s1);
@@ -446,6 +449,7 @@
 			goto QUIT;
 
 		case 'r':
+		case '2':
 			/* Choose right column as-is. */
 			if (s2 != NULL)
 				fprintf(outfile, "%s\n", s2);
@@ -1018,8 +1022,8 @@
 	    "eb:\tedit both diffs concatenated\n"
 	    "el:\tedit left diff\n"
 	    "er:\tedit right diff\n"
-	    "l:\tchoose left diff\n"
-	    "r:\tchoose right diff\n"
+	    "l | 1:\tchoose left diff\n"
+	    "r | 2:\tchoose right diff\n"
 	    "s:\tsilent mode--don't print identical lines\n"
 	    "v:\tverbose mode--print identical lines\n"
 	    "q:\tquit");