diff options
| author | Malf Furious <m@lfurio.us> | 2017-09-06 03:41:32 -0400 |
|---|---|---|
| committer | Malf Furious <m@lfurio.us> | 2017-09-06 03:41:32 -0400 |
| commit | 8907b67e1fb043da87696ce7662e6a12922f80eb (patch) | |
| tree | 659312225c43cd3e07c02dab3ef4b84c57e7d965 | |
| parent | 6a47d2874328c4ec70dc36a572c31d20b3aab0b3 (diff) | |
| download | systrunk-8907b67e1fb043da87696ce7662e6a12922f80eb.tar.gz systrunk-8907b67e1fb043da87696ce7662e6a12922f80eb.zip | |
Export merge operations from main()
| -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 |