1
1
mirror of https://github.com/go-gitea/gitea synced 2025-01-11 02:04:27 +00: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
..
2017-12-30 18:47:52 -06:00
2019-01-23 13:58:38 -05:00
2019-11-11 23:15:29 +08:00
2019-12-17 16:34:11 -05:00
2015-12-21 04:24:11 -08:00