Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Enable Style/DotPosition Rubocop :cop: | Grzegorz Bizon | 2017-06-21 | 1 | -15/+14 |
* | Keep trailing newline when picking conflict sections32983-merge-conflict-resolution-removed-the-newline-in-the-end-of-file | Sean McGivern | 2017-06-01 | 1 | -3/+39 |
* | Stop MR conflict code from blowing up when branches are missingdm-no-conflicts-when-branches-are-missing | Douwe Maan | 2017-05-18 | 1 | -0/+7 |
* | Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-repos | Sean McGivern | 2017-05-12 | 2 | -0/+295 |