0
0
mirror of https://github.com/go-gitea/gitea.git synced 2025-03-03 13:45:02 +01:00
zeripath 9789e0ad53
Only show conflicted files if not merged (#10197)
* Only show conflicted files if not merged

* try again

Co-authored-by: Antoine GIRARD <sapk@users.noreply.github.com>
Co-authored-by: techknowlogick <matti@mdranta.net>
2020-02-09 21:53:41 -05:00
..
2019-01-23 13:58:38 -05:00