tg-merge: support changing a file in many branches