summaryrefslogtreecommitdiff
path: root/usr.bin/tmux/tmux.c
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin/tmux/tmux.c')
-rw-r--r--usr.bin/tmux/tmux.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/usr.bin/tmux/tmux.c b/usr.bin/tmux/tmux.c
index 671b6999c91..b2466d034f8 100644
--- a/usr.bin/tmux/tmux.c
+++ b/usr.bin/tmux/tmux.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.c,v 1.9 2009/06/23 18:27:40 nicm Exp $ */
+/* $OpenBSD: tmux.c,v 1.10 2009/06/25 06:40:25 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -233,19 +233,11 @@ main(int argc, char **argv)
cfg_file = xstrdup(optarg);
break;
case 'L':
- if (path != NULL) {
- log_warnx("-L and -S cannot be used together");
- exit(1);
- }
if (label != NULL)
xfree(label);
label = xstrdup(optarg);
break;
case 'S':
- if (label != NULL) {
- log_warnx("-L and -S cannot be used together");
- exit(1);
- }
if (path != NULL)
xfree(path);
path = xstrdup(optarg);