diff mercurial/util.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 c2932ad5476a
children 3d5547845158
line wrap: on
line diff