torambo.com/Momentum-Apps @ 798a08d6dd5eece30b1b3e4468b85f43bb59e77e

Willy-JL 7e6b0176bb Improve conflict handling		%!s(int64=2) %!d(string=hai) anos
..
add-subtree.sh	09bdf56126 Those should be executable	%!s(int64=2) %!d(string=hai) anos
bulk-update-subtrees.sh	09bdf56126 Those should be executable	%!s(int64=2) %!d(string=hai) anos
subtree-subdir-helper.sh	60f67941e8 This didnt work well with submodules	%!s(int64=2) %!d(string=hai) anos
update-subtree.sh	7e6b0176bb Improve conflict handling	%!s(int64=2) %!d(string=hai) anos