diff hgmerge @ 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 6a03cff2b0f5
children e4480f2b61e9
line wrap: on
line diff