diff tests/test-confused-revert.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 6c6c0e5595a2
children 25857e00af8e
line wrap: on
line diff