hg/pyhgsh: tests/test-merge5.out annotate

annotate tests/test-merge5.out @ 814:0902ffece4b4

Merge with BOS

author	mpm@selenic.com
date	Sat, 30 Jul 2005 09:00:14 -0800
parents	8f5637f0a0c0 61ed30e82b27
children	77e121a0d870 0932bc2fb2be 1fe3b14c7044

rev	line source
415 c2b9502a4e96 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted mpm@selenic.com parents: diff changeset	1 + hg init
c2b9502a4e96 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted mpm@selenic.com parents: diff changeset	2 + hg add a b
801 1f9ec150a476 Updated output of tests. Thomas Arendsen Hein <thomas@intevation.de> parents: 767 diff changeset	3 + hg commit -m commit #0 -d 0 0
1f9ec150a476 Updated output of tests. Thomas Arendsen Hein <thomas@intevation.de> parents: 767 diff changeset	4 + hg commit -mcomment #1 -d 0 0
415 c2b9502a4e96 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted mpm@selenic.com parents: diff changeset	5 + hg update 0
801 1f9ec150a476 Updated output of tests. Thomas Arendsen Hein <thomas@intevation.de> parents: 767 diff changeset	6 + hg commit -A -mcomment #2 -d 0 0
767 61ed30e82b27 Update tests to match new addremove chattiness. Bryan O'Sullivan <bos@serpentine.com> parents: 749 diff changeset	7 removing b
415 c2b9502a4e96 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted mpm@selenic.com parents: diff changeset	8 + hg update 1
c2b9502a4e96 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted mpm@selenic.com parents: diff changeset	9 this update spans a branch affecting the following files:
616 d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: 415 diff changeset	10 b
415 c2b9502a4e96 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted mpm@selenic.com parents: diff changeset	11 aborting update spanning branches!
c2b9502a4e96 [PATCH] Don't prompt user for keep-vs-delete when the merge is about to be aborted mpm@selenic.com parents: diff changeset	12 (use update -m to perform a branch merge)