Fixes bug caused by debug code left behind.

Potherca · Potherca · commit fcc0b8772887 · 2018-10-18T09:30:06.000+02:00
diff --git a/src/git-split-file.sh b/src/git-split-file.sh
@@ -371,7 +371,7 @@ mergeSplitBranch() {
                 && commit "Merging split file '${g_sSourceFileName}'"
         ) || (
             printStatus 'Merge conflict remains. Attempting to resolve more aggressively.'
-            git add $(cat git-status.log | grep -o -E 'added by us: .*' | cut -d ':' -f 2) \
+            git add $(cat git status | grep -o -E 'added by us: .*' | cut -d ':' -f 2) \
                 && commit "Merging split file '${g_sSourceFileName}'"
         )
     else

Original file line number	Diff line number	Diff line change
`@@ -371,7 +371,7 @@ mergeSplitBranch() {`
`371`	`371`	`&& commit "Merging split file '${g_sSourceFileName}'"`
`372`	`372`	`) \|\| (`
`373`	`373`	`printStatus 'Merge conflict remains. Attempting to resolve more aggressively.'`
`374`		`- git add $(cat git-status.log \| grep -o -E 'added by us: .*' \| cut -d ':' -f 2) \`
	`374`	`+ git add $(cat git status \| grep -o -E 'added by us: .*' \| cut -d ':' -f 2) \`
`375`	`375`	`&& commit "Merging split file '${g_sSourceFileName}'"`
`376`	`376`	`)`
`377`	`377`	`else`