diff options
author | zeripath <art27@cantab.net> | 2020-02-10 02:53:41 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-09 21:53:41 -0500 |
commit | 9789e0ad531a76f708eba9dddab5381419c6eebe (patch) | |
tree | 0cc7b546fef96aae469adcfe73dcf1c8ba4a4ab0 /.changelog.yml | |
parent | 875c5e13050e4f7b95773c3b8ef5deac8b4b581b (diff) | |
download | gitea-9789e0ad531a76f708eba9dddab5381419c6eebe.tar.gz gitea-9789e0ad531a76f708eba9dddab5381419c6eebe.zip |
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>
Diffstat (limited to '.changelog.yml')
0 files changed, 0 insertions, 0 deletions