Revision d84be7c3
Added by Andreas Kohlbecker almost 8 years ago
| .gitattributes | ||
|---|---|---|
| 1 |
pom.xml merge=ours |
|
| 1 | 2 |
* text=auto !eol |
| 2 | 3 |
/LICENSE.TXT -text |
| 3 | 4 |
ide/eclipse/cdm-server[!!-~]-[!!-~]help.launch -text |
Also available in: Unified diff
adding merge strategy for gitflow releases