bareos: master ce37e849
| Author | Committer | Branch | Timestamp | Parent | |
|---|---|---|---|---|---|
| arogge | pstorz | master | 2022-02-03 11:43 | master 746e7a10 | Pending |
| Changeset | set merge strategy for CHANGELOG.md to union This patch adds a .gitattributes file that will configure the merge strategy for CHANGELOG.md to union. This will make sure conflict resolution will simply keep all lines added. This may produce bogus merges, but will usually do the right thing. As always, make sure to review your files after a merge. |
||||
| add - .gitattributes | Diff File | ||||
