1. 02 4月, 2018 2 次提交
  2. 31 3月, 2018 1 次提交
  3. 30 3月, 2018 6 次提交
  4. 29 3月, 2018 2 次提交
  5. 28 3月, 2018 10 次提交
  6. 27 3月, 2018 12 次提交
  7. 24 3月, 2018 1 次提交
    • S
      Fix 500 error when trying to resolve non-ASCII conflicts in editor · 70af1e2e
      Sean McGivern 提交于
      When we added caching, this meant that calling `can_be_resolved_in_ui?` didn't
      always call `lines`, which meant that we didn't get the benefit of the
      side-effect from that, where it forced the conflict data itself to UTF-8.
      
      To fix that, make this explicit by separating the `raw_content` (any encoding)
      from the `content` (which is either UTF-8, or an exception is raised).
      70af1e2e
  8. 23 3月, 2018 6 次提交