equal
deleted
inserted
replaced
123 $ hg rm large normal3 |
123 $ hg rm large normal3 |
124 $ hg commit -q -m"remove large, normal3" |
124 $ hg commit -q -m"remove large, normal3" |
125 $ hg merge |
125 $ hg merge |
126 merging sub/maybelarge.dat and stuff/maybelarge.dat to stuff/maybelarge.dat |
126 merging sub/maybelarge.dat and stuff/maybelarge.dat to stuff/maybelarge.dat |
127 warning: $TESTTMP/bigfile-repo/stuff/maybelarge.dat looks like a binary file. (glob) |
127 warning: $TESTTMP/bigfile-repo/stuff/maybelarge.dat looks like a binary file. (glob) |
128 merging stuff/maybelarge.dat incomplete! (edit conflicts, then use 'hg resolve --mark') |
128 warning: conflicts while merging stuff/maybelarge.dat! (edit, then use 'hg resolve --mark') |
129 merging sub/normal2 and stuff/normal2 to stuff/normal2 |
129 merging sub/normal2 and stuff/normal2 to stuff/normal2 |
130 0 files updated, 1 files merged, 0 files removed, 1 files unresolved |
130 0 files updated, 1 files merged, 0 files removed, 1 files unresolved |
131 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
131 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
132 [1] |
132 [1] |
133 $ hg cat -r . sub/maybelarge.dat > stuff/maybelarge.dat |
133 $ hg cat -r . sub/maybelarge.dat > stuff/maybelarge.dat |