From 8907b67e1fb043da87696ce7662e6a12922f80eb Mon Sep 17 00:00:00 2001 From: Malf Furious Date: Wed, 6 Sep 2017 03:41:32 -0400 Subject: Export merge operations from main() --- main.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/main.sh b/main.sh index 0c3d3df..9bf4df1 100644 --- a/main.sh +++ b/main.sh @@ -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 -- cgit v1.2.3