Sean McGivern
|
f0bbfe7a62
|
Add match line headers
|
2016-08-12 23:24:44 +03:00 |
|
Sean McGivern
|
f2f844693e
|
Handle conflict resolution errors in controller
|
2016-08-12 23:24:44 +03:00 |
|
Sean McGivern
|
7af277f683
|
Auto-highlight conflict when rich_text is called
|
2016-08-12 23:24:43 +03:00 |
|
Sean McGivern
|
14a4b17d1c
|
Allow resolving conflicts in MR controller
|
2016-08-12 23:24:43 +03:00 |
|
Sean McGivern
|
a1c7961217
|
Handle multiple merge conflict files in collection
|
2016-08-12 23:24:43 +03:00 |
|
Sean McGivern
|
df2ed097b7
|
Add backend for merge conflicts reading
|
2016-08-12 23:24:43 +03:00 |