Age | Commit message (Expand) | Author |
---|---|---|
2017-01-24 | Add docs for resolve conflicts editor | Achilleas Pipinellis |
2016-08-25 | Handle non-UTF-8 conflicts gracefully | Sean McGivern |
2016-08-17 | Reference the version 'UI resolve conflicts' was introduced | Achilleas Pipinellis |
2016-08-12 | Add merge conflict docs | Sean McGivern |