Jacob Vosmaer 9f8326995c Partially rever "Revert "Merge branch 'gitaly-mandatory-20180703-jv' into 'master'"" ... This partially reverts commit 64dfe2cba1.		2018-07-06 11:43:01 +02:00
..
file.rb	Fix 500 error when trying to resolve non-ASCII conflicts in editor	2018-03-23 18:33:14 +00:00
parser.rb	Fix 500 error when trying to resolve non-ASCII conflicts in editor	2018-03-23 18:33:14 +00:00
resolution.rb	Simplify conflict resolution interface and code	2018-01-02 16:22:02 -03:00
resolver.rb	Partially rever "Revert "Merge branch 'gitaly-mandatory-20180703-jv' into 'master'""	2018-07-06 11:43:01 +02:00