---

yaml
---
r: 30972
b: refs/heads/incoming
c: c73e332
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: b6692500ffc141cdf202af9c9f88782c396cd333
+refs/heads/incoming: c73e3320f89111a3d782314b5033127234e1fe99
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libstd/getopts.rs

@@ -381,7 +381,6 @@ pub fn opt_str(mm: Matches, nm: &str) -> ~str {
  * option took an argument
  */
 pub fn opts_str(mm: Matches, names: &[~str]) -> ~str {
->>>>>>> Remove uses of + mode from libstd
     for vec::each(names) |nm| {
         match opt_val(mm, *nm) {
           Val(copy s) => return s,