commit 8623da417336632468dae24cf947b9808159c0f4 parent 3fdb4b5d04370806721f18effff4cec3c7849309 Author: William Morgan <wmorgan-sup@masanjin.net> Date: Thu, 14 Jan 2010 08:54:35 -0500 Merge branch 'master' into next Conflicts: bin/sup-add Diffstat:
| M | bin/sup-add | | | 1 | + |
1 file changed, 1 insertion(+), 0 deletions(-) diff --git a/bin/sup-add b/bin/sup-add @@ -87,6 +87,7 @@ end $terminal.wrap_at = :auto Redwood::start index = Redwood::Index.init $opts[:index] +index.load index.lock_interactively or exit