From 753d66cad3c8f907c0140e72d7b4807aa1316247 Mon Sep 17 00:00:00 2001
From: Valdir Mendes <valdir.mfjesus@yahoo.com.br>
Date: Tue, 14 Jan 2020 12:54:24 -0300
Subject: [PATCH] Changing report name to zabapgit_full in merge (#3154)

* Changing report name to zabapgit_full in merge

* Fixing sh merge command

* Fixing abapmerge version

* Update package.json

Co-Authored-By: Lars Hvam <larshp@hotmail.com>

Co-authored-by: Lars Hvam <larshp@hotmail.com>
---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 23db87314..5ebdb3452 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "license": "MIT",
   "scripts": {
     "test": "npm run eslint && npm run abaplint",
-    "merge": "abapmerge -f src/zabapgit.prog.abap > zabapgit.abap",
+    "merge": "abapmerge -f src/zabapgit.prog.abap -c zabapgit_full > zabapgit.abap",
     "abaplint": "abaplint",
     "eslint": "eslint src"
   },
@@ -12,7 +12,7 @@
   },
   "devDependencies": {
     "abaplint": "^2.1.6",
-    "abapmerge": "^0.11.5",
+    "abapmerge": "^0.13.0",
     "eslint": "^6.5.1"
   }
 }