diff tests/test-commit.out @ 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 ef53d200df3d
children c9cd63a6fce9
line wrap: on
line diff