diff mercurial/templater.py @ 2903:013921c753bd

merge with other head by default, not tip. fixes issue 339.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Tue, 15 Aug 2006 11:38:07 -0700
parents 3d6efcbbd1c9
children e18c3d08528d
line wrap: on
line diff