again, improve translation script
This commit is contained in:
parent
d27c4f14e4
commit
7eae67714a
|
@ -27,7 +27,10 @@ elif [ "$1" = "s" ]; then
|
||||||
elif [ "$1" = "a" ]; then
|
elif [ "$1" = "a" ]; then
|
||||||
printf "Apply translation %s\n" $version
|
printf "Apply translation %s\n" $version
|
||||||
git cherry-pick t/$(echo $version)
|
git cherry-pick t/$(echo $version)
|
||||||
if [ $? = 0 ]; then
|
returncode=$?
|
||||||
|
if [ $returncode = 1 ]; then
|
||||||
|
git mergetool
|
||||||
|
elif [ $returncode = 0 ]; then
|
||||||
next
|
next
|
||||||
show
|
show
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue