diff options
Diffstat (limited to 'main.sh')
| -rw-r--r-- | main.sh | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -49,6 +49,14 @@ function main systr_short_log "$@" elif [[ "$cmd" == "log" ]]; then systr_log "$@" + elif [[ "$cmd" == "merge" ]]; then + systr_merge "$@" + elif [[ "$cmd" == "update" ]]; then + systr_merge "TRAC" "$@" + elif [[ "$cmd" == "apply-merge" ]]; then + systr_merge_finish "$MERG" "$@" + elif [[ "$cmd" == "abort-merge" ]]; then + systr_merge_abort "$@" else echo "Fatal: $cmd not recognized" >&2 exit 1 |