# HG changeset patch
# User Karoly Lorentey <lorentey@elte.hu>
# Date 1125930534 0
# Node ID df547ba04c0f42bfe1f4298bbbffe090695bfc72
# Parent  e0dbda31f619a129b63b0a56739c23b466392606
Add =upstream-branch file for semi-automated merges.

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-396