development/gitg
development/gitg
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gitg synced 2024-11-04 23:34:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Include conflict status

Browse source
This commit is contained in:
Alberto Fanjul 2022-03-14 07:03:42 +01:00
parent d048a23901
commit ddda7f14c4
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libgitg/gitg-stage-status-enumerator.vala
View file

@ -46,11 +46,15 @@ public class StageStatusFile : Object, StageStatusItem
private static Ggit.StatusFlags s_work_flags =
Ggit.StatusFlags.WORKING_TREE_MODIFIED
| Ggit.StatusFlags.WORKING_TREE_DELETED
| Ggit.StatusFlags.WORKING_TREE_TYPECHANGE;
| Ggit.StatusFlags.WORKING_TREE_TYPECHANGE
| Ggit.StatusFlags.CONFLICTED;
private static Ggit.StatusFlags s_untracked_flags =
Ggit.StatusFlags.WORKING_TREE_NEW;
private static Ggit.StatusFlags s_ignored_flags =
Ggit.StatusFlags.IGNORED;
public StageStatusFile(string path, Ggit.StatusFlags flags)
{
d_path = path;