Commit graph

7 commits

Author SHA1 Message Date
Sean McGivern
3b84cfdc74 Use same resolution format on FE and BE 2016-08-12 23:24:46 +03:00
Fatih Acet
8b6a075e6f Implement commit in merge conflicts UI. 2016-08-12 23:24:46 +03:00
Fatih Acet
c2295fbdf8 Render right sidebar and handle request error. 2016-08-12 23:24:46 +03:00
Fatih Acet
5625e8281a Check line lengths and fill missing lines with empty lines. 2016-08-12 23:24:45 +03:00
Fatih Acet
b0b5e9f161 Refactor data parser to remove duplicated objects. 2016-08-12 23:24:45 +03:00
Fatih Acet
85507b25e4 Fixes for match lines in parallel view. 2016-08-12 23:24:45 +03:00
Fatih Acet
5c7a7093b7 Added ES6 MergeConflictResolver classes. 2016-08-12 23:24:44 +03:00