diff options
| author | Magnus Ahltorp <map@kth.se> | 2016-10-14 16:54:57 +0200 |
|---|---|---|
| committer | Magnus Ahltorp <map@kth.se> | 2016-10-14 16:54:57 +0200 |
| commit | c8af4e40e0096f60a5cf5039be775ff002619c4d (patch) | |
| tree | e059ba998a4624fa950c12e2ca369be30d92c61d /tools/merge | |
| parent | c1dfe32e2ba948e62535102ab6dbafa60c3c6eda (diff) | |
Test failing merge backup
Refactor tests
Diffstat (limited to 'tools/merge')
| -rwxr-xr-x | tools/merge | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/merge b/tools/merge index 220ef03..b5a50d5 100755 --- a/tools/merge +++ b/tools/merge @@ -1,5 +1,7 @@ #! /bin/sh +set -o errexit + BINDIR=$(dirname $0) $BINDIR/merge_fetch.py "$@" |