equal
deleted
inserted
replaced
468 | o 1 B public |
468 | o 1 B public |
469 |/ |
469 |/ |
470 o 0 A public |
470 o 0 A public |
471 |
471 |
472 |
472 |
473 $ hg rebase --dest 7 --source 5 |
473 $ cat > $TESTTMP/checkeditform.sh <<EOF |
|
474 > env | grep HGEDITFORM |
|
475 > true |
|
476 > EOF |
|
477 $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg rebase --dest 7 --source 5 -e |
|
478 HGEDITFORM=rebase.merge |
|
479 HGEDITFORM=rebase.normal |
474 saved backup bundle to $TESTTMP/a3/c4/.hg/strip-backup/*-backup.hg (glob) |
480 saved backup bundle to $TESTTMP/a3/c4/.hg/strip-backup/*-backup.hg (glob) |