diff tests/test-git-import @ 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 e2b69dbb2daa
children 1c9b6f1237e0
line wrap: on
line diff