mercurial-crew-with-dirclash: tests/test-merge1.out annotate

annotate tests/test-merge1.out @ 1504:0fcdd126642d

fix file opening for some commands on Windows Using file as opener in debug commands won't work on Windows, as the index and data files needs to be opened in binary mode.

author	Christian Boos <cboos@neuf.fr>
date	Thu, 03 Nov 2005 14:24:07 -0800
parents	67a28636ea64
children	db10b7114de0

rev	line source
1236 67a28636ea64 Fix bug with co -C across branches, update tests mpm@selenic.com parents: 925 diff changeset	1 %% no merges expected
67a28636ea64 Fix bug with co -C across branches, update tests mpm@selenic.com parents: 925 diff changeset	2 %% merge of b expected
407 0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	3 merging for b
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	4 merging b
1236 67a28636ea64 Fix bug with co -C across branches, update tests mpm@selenic.com parents: 925 diff changeset	5 %%
67a28636ea64 Fix bug with co -C across branches, update tests mpm@selenic.com parents: 925 diff changeset	6 Contents of b should be "this is file b1"
430 5b22029b5aa2 Fix up test-merge1 mpm@selenic.com parents: 407 diff changeset	7 This is file b1
1236 67a28636ea64 Fix bug with co -C across branches, update tests mpm@selenic.com parents: 925 diff changeset	8 %% merge expected!
430 5b22029b5aa2 Fix up test-merge1 mpm@selenic.com parents: 407 diff changeset	9 merging for b
5b22029b5aa2 Fix up test-merge1 mpm@selenic.com parents: 407 diff changeset	10 merging b
1236 67a28636ea64 Fix bug with co -C across branches, update tests mpm@selenic.com parents: 925 diff changeset	11 %% merge of b expected
407 0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	12 merging for b
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	13 merging b