diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-05-18 15:48:42 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-05-18 15:48:42 -0500 |
| commit | 7a7e9288d4dea50a9797b3f624bf8174fa7060d4 (patch) | |
| tree | 673deb5b6d8047b511ff01e9d7c1110fc4f0812a /.mailmap | |
| parent | b46b52af37fd8c800e8fdca5de25be31415c7d5d (diff) | |
| download | gitlab-ce-7a7e9288d4dea50a9797b3f624bf8174fa7060d4.tar.gz | |
Stop MR conflict code from blowing up when branches are missingdm-no-conflicts-when-branches-are-missing
Diffstat (limited to '.mailmap')
0 files changed, 0 insertions, 0 deletions