Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Concat added to the merge type list #40

Merged
merged 1 commit into from

2 participants

@xtr3me

Hi,
I have added the concat type to the list of merge types so it can be used.

Regards,
Sjors

@jmettraux
Owner

Hello Sjors,

sorry about that. I have to add a test for "concat".

Many thanks !

John

@jmettraux jmettraux merged commit 96c4dbd into jmettraux:master
@jmettraux
Owner

added: 3d6f05a

Sorry again,

John

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Dec 11, 2011
  1. @xtr3me
This page is out of date. Refresh to see the latest.
Showing with 1 addition and 1 deletion.
  1. +1 −1  lib/ruote/exp/fe_concurrence.rb
View
2  lib/ruote/exp/fe_concurrence.rb
@@ -217,7 +217,7 @@ def apply
h.cmerge = att(
:merge, %w[ first last highest lowest ])
h.cmerge_type = att(
- :merge_type, %w[ override mix isolate stack union ignore ])
+ :merge_type, %w[ override mix isolate stack union ignore concat ])
h.remaining = att(
:remaining, %w[ cancel forget ])
Something went wrong with that request. Please try again.