diff options
| author | Fred Hebert <mononcqc@ferd.ca> | 2015-11-26 18:17:35 -0500 |
|---|---|---|
| committer | Fred Hebert <mononcqc@ferd.ca> | 2015-11-26 18:17:35 -0500 |
| commit | 901620fb603d98b7c030e30bb43f63a8a5a6ed08 (patch) | |
| tree | 8f57edd2534acc963e94015c3b70dcbd117c662b /src/rebar_opts.erl | |
| parent | be1853531e6e8984b5184925795b9a2f3a37a417 (diff) | |
| parent | 996da460b0b0939afa53a2383f15f88ac8cca9de (diff) | |
Merge pull request #942 from tsloughter/relx_profiles
special handling of relx configs in profiles
Diffstat (limited to 'src/rebar_opts.erl')
| -rw-r--r-- | src/rebar_opts.erl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/rebar_opts.erl b/src/rebar_opts.erl index 97f39b8..b02a504 100644 --- a/src/rebar_opts.erl +++ b/src/rebar_opts.erl @@ -115,6 +115,8 @@ merge_opts(NewOpts, OldOpts) -> Value; (mib_first_files, NewValue, OldValue) -> OldValue ++ NewValue; + (relx, NewValue, OldValue) -> + rebar_utils:tup_umerge(OldValue, NewValue); (_Key, NewValue, OldValue) when is_list(NewValue) -> case io_lib:printable_list(NewValue) of true when NewValue =:= [] -> |