diff options
| author | Andre Hartmann <[email protected]> | 2025-07-22 11:18:00 +0200 |
|---|---|---|
| committer | André Hartmann <[email protected]> | 2025-08-04 10:07:58 +0000 |
| commit | f8a0faca9220b4527be9cd776dd10b2f0fb6bd9c (patch) | |
| tree | 72e4409492084ed2728b16464549df242ff71d93 /src/plugins/git/commitdata.h | |
| parent | 546fb6e7590b7173e071e858bc949114c466c8ce (diff) | |
Git: SubmitEditor: Add actions for conflicted files
Change-Id: I2368eb97faf844cd010b005fc19691fec30242d7
Reviewed-by: Orgad Shaneh <[email protected]>
Diffstat (limited to 'src/plugins/git/commitdata.h')
| -rw-r--r-- | src/plugins/git/commitdata.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/plugins/git/commitdata.h b/src/plugins/git/commitdata.h index 6ea9d6df7fc..e88a732990c 100644 --- a/src/plugins/git/commitdata.h +++ b/src/plugins/git/commitdata.h @@ -29,7 +29,13 @@ enum FileAction { FileOpenEditor, FileStage, FileUnstage, - FileAddGitignore + FileAddGitignore, + FileMergeTool, + FileMergeResolved, + FileMergeOurs, + FileMergeTheirs, + FileMergeRemove, + FileMergeRecover }; enum PushAction { |