view tests/test-merge2.out @ 876:14cfaaec2e8e

Get patchbomb script to not use MIME attachments. Adding patches as attachments makes it difficult or impossible for some mail clients to quote them effectively.
author Bryan O'Sullivan <bos@serpentine.com>
date Tue, 09 Aug 2005 20:53:50 -0800
parents 0902ffece4b4
children 5a034646e472
line wrap: on
line source

+ hg init
+ hg add a
+ hg commit -m commit #0 -d 0 0
+ hg add b
+ hg commit -m commit #1 -d 0 0
+ hg update 0
+ hg add b
+ hg commit -m commit #2 -d 0 0
+ hg init
+ hg add a
+ hg commit -m commit #0 -d 0 0
+ hg add b
+ hg commit -m commit #1 -d 0 0
+ hg update 0
+ hg commit -A -m commit #2 -d 0 0
adding b
+ hg init
+ hg add a
+ hg commit -m commit #0 -d 0 0
+ hg add b
+ hg commit -m commit #1 -d 0 0
+ hg remove b
+ hg update 0
+ hg commit -A -m commit #2 -d 0 0
adding b