comparison config.bat @ 83356:df547ba04c0f

Add =upstream-branch file for semi-automated merges. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-396
author Karoly Lorentey <lorentey@elte.hu>
date Mon, 05 Sep 2005 14:28:54 +0000
parents c53a9463c31a
children b99080e25b28 f9a65d7ebd29
comparison
equal deleted inserted replaced
83355:e0dbda31f619 83356:df547ba04c0f