diff options
Diffstat (limited to 'merge.sh')
| -rw-r--r-- | merge.sh | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -105,7 +105,7 @@ function systr_merge commit="$1" - systr_merge_tree "$commit" + (systr_merge_tree "$commit") echo "$commit" >.systr/MERG # resolve conflicts # @@ -163,7 +163,7 @@ function systr_merge done # apply merge # - systr_merge_finish "$commit" + (systr_merge_finish "$commit") } ## |