sthen e7d0856ba7 add conflict marker %!s(int64=10) %!d(string=hai) anos
..
DESCR 7eab5d4cb6 revert to previous release following the advice of jasper@ and %!s(int64=14) %!d(string=hai) anos
MESSAGE 7eab5d4cb6 revert to previous release following the advice of jasper@ and %!s(int64=14) %!d(string=hai) anos
PLIST e7d0856ba7 add conflict marker %!s(int64=10) %!d(string=hai) anos