mirror of https://github.com/abapGit/abapGit.git synced 2025-04-30 11:46:38 +08:00

Git client for ABAP

Go to file

WolfTreak 0aecdf7255 Possible solution to zabapgit merge functionality to resolve conflicts (#1407 ) * 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		2018-05-27 16:20:43 +02:00
docs	docs: IEXT + IDOC supported	2018-05-19 10:17:41 +02:00
src	Possible solution to zabapgit merge functionality to resolve conflicts (#1407 )	2018-05-27 16:20:43 +02:00
.abapgit.xml	ignore code of conduct	2017-10-25 04:52:53 +00:00
.gitignore	run abapmerge as part of test	2018-01-14 13:09:22 +00:00
.travis.yml	use node 8	2017-06-10 13:42:14 +02:00
changelog.txt	v1.67.0	2018-05-19 09:34:39 +02:00
CODE_OF_CONDUCT.md	Update CODE_OF_CONDUCT.md	2017-10-16 17:31:46 -02:00
CONTRIBUTING.md	Update CONTRIBUTING.md	2018-05-27 12:52:38 +02:00
LICENSE	Create LICENSE	2014-07-08 15:07:58 +02:00
package.json	set abaplint to 702	2018-03-30 11:30:17 +00:00
README.md	abaplint badge, use https	2018-05-12 08:00:37 +02:00
travis.sh	move builds, #1136	2018-01-14 13:24:39 +00:00