diff mercurial/hg.py @ 15379:3ca419fb435e stable

Makefile: adjust example, test-merge1 is now test-merge1.t
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 28 Oct 2011 12:59:50 +0200
parents dbdb777502dc
children c519cd8f0169
line wrap: on
line diff