SAP/abapGit
1
0
Fork 0
mirror of https://github.com/abapGit/abapGit.git synced 2025-04-30 11:46:38 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1592 from christianguenter2/1573

Browse Source 
merge page: remove duplication
This commit is contained in:
Lars Hvam 2018-07-08 11:41:22 +02:00 committed by GitHub
commit 3483587879
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ui/zcl_abapgit_gui_page_merge.clas.abap
View File

@ -190,7 +190,6 @@ CLASS zcl_abapgit_gui_page_merge IMPLEMENTATION.
EXPORTING
io_repo = mo_repo
io_stage = mo_merge->get_result( )-stage.
ev_state = zif_abapgit_definitions=>gc_event_state-new_page.
ELSE.
@ -198,11 +197,13 @@ CLASS zcl_abapgit_gui_page_merge IMPLEMENTATION.
EXPORTING
io_repo = mo_repo
io_stage = mo_merge->get_result( )-stage.
ev_state = zif_abapgit_definitions=>gc_event_state-new_page.
ENDIF.
ev_state = zif_abapgit_definitions=>gc_event_state-new_page.
WHEN c_actions-res_conflicts.
CREATE OBJECT ei_page TYPE zcl_abapgit_gui_page_merge_res
EXPORTING
io_repo = mo_repo