mirror of
https://github.com/abapGit/abapGit.git
synced 2025-05-01 04:08:27 +08:00
0aecdf7255
* Merging per Textfile * Add files via upload * Delete WolfTreak_ABAPGIT_Merging * Refactoring vom Coding, Darstellung verbessert * Merging page changed and also merging class extended to instance and conflict methods added * Refactoring for Travis * Refactoring for Travis * Escaping of merged content functions now correct
46 lines
1.4 KiB
XML
46 lines
1.4 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<abapGit version="v1.0.0" serializer="LCL_OBJECT_CLAS" serializer_version="v1.0.0">
|
|
<asx:abap xmlns:asx="http://www.sap.com/abapxml" version="1.0">
|
|
<asx:values>
|
|
<VSEOCLASS>
|
|
<CLSNAME>ZCL_ABAPGIT_GUI_PAGE_MERGE_RES</CLSNAME>
|
|
<VERSION>1</VERSION>
|
|
<LANGU>E</LANGU>
|
|
<DESCRIPT>GUI - Resolving Conflicts page</DESCRIPT>
|
|
<EXPOSURE>2</EXPOSURE>
|
|
<STATE>1</STATE>
|
|
<CLSFINAL>X</CLSFINAL>
|
|
<CLSCCINCL>X</CLSCCINCL>
|
|
<FIXPT>X</FIXPT>
|
|
<UNICODE>X</UNICODE>
|
|
</VSEOCLASS>
|
|
<DESCRIPTIONS>
|
|
<SEOCOMPOTX>
|
|
<CLSNAME>ZCL_ABAPGIT_GUI_PAGE_MERGE_RES</CLSNAME>
|
|
<CMPNAME>MO_MERGE</CMPNAME>
|
|
<LANGU>E</LANGU>
|
|
<DESCRIPT>Merge logic</DESCRIPT>
|
|
</SEOCOMPOTX>
|
|
<SEOCOMPOTX>
|
|
<CLSNAME>ZCL_ABAPGIT_GUI_PAGE_MERGE_RES</CLSNAME>
|
|
<CMPNAME>MO_MERGE_PAGE</CMPNAME>
|
|
<LANGU>E</LANGU>
|
|
<DESCRIPT>GUI - Merging page</DESCRIPT>
|
|
</SEOCOMPOTX>
|
|
<SEOCOMPOTX>
|
|
<CLSNAME>ZCL_ABAPGIT_GUI_PAGE_MERGE_RES</CLSNAME>
|
|
<CMPNAME>MO_REPO</CMPNAME>
|
|
<LANGU>E</LANGU>
|
|
<DESCRIPT>Online Repository</DESCRIPT>
|
|
</SEOCOMPOTX>
|
|
<SEOCOMPOTX>
|
|
<CLSNAME>ZCL_ABAPGIT_GUI_PAGE_MERGE_RES</CLSNAME>
|
|
<CMPNAME>MV_CURRENT_CONFLICT_INDEX</CMPNAME>
|
|
<LANGU>E</LANGU>
|
|
<DESCRIPT>Row Index of Internal Tables</DESCRIPT>
|
|
</SEOCOMPOTX>
|
|
</DESCRIPTIONS>
|
|
</asx:values>
|
|
</asx:abap>
|
|
</abapGit>
|