Merge branch 'sync-repair' of https://github.com/jpgrayson/stgit