Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-extdiff @ 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 | 8fd6925ae32f |
children | d77022db1bca |
line wrap: on
line source
#!/bin/sh HGRCPATH=$HGTMP/.hgrc; export HGRCPATH echo "[extensions]" >> $HGTMP/.hgrc echo "extdiff=" >> $HGTMP/.hgrc hg init a cd a echo a > a hg add hg extdiff -o -Nr echo "[extdiff]" >> $HGTMP/.hgrc echo "cmd.falabala=echo" >> $HGTMP/.hgrc echo "opts.falabala=diffing" >> $HGTMP/.hgrc hg falabala hg help falabala hg ci -d '0 0' -mtest1 echo b >> a hg ci -d '1 0' -mtest2 hg falabala -r 0:1 || echo "diff-like tools yield a non-zero exit code"