Fix bug caused by incorrect refactor

Previously a log file was used. This was replaced by a direct call to `git log`.
However, the `cat` command was left in place, hence the bug.

Fixes #7

Author: Potherca

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 | grep -o -E 'added by us: .*' | cut -d ':' -f 2) \
+            git add $(git status | grep -o -E 'added by us: .*' | cut -d ':' -f 2) \
                 && commit "Merging split file '${g_sSourceFileName}'"
         )
     else