equal
deleted
inserted
replaced
123 |
123 |
124 $ HGMERGE=internal:other hg qpush -a -m -n refqueue |
124 $ HGMERGE=internal:other hg qpush -a -m -n refqueue |
125 merging with queue at: $TESTTMP/t2/.hg/refqueue (glob) |
125 merging with queue at: $TESTTMP/t2/.hg/refqueue (glob) |
126 applying patcha |
126 applying patcha |
127 patching file a |
127 patching file a |
128 Hunk #1 FAILED at 0 |
128 Hunk #1 succeeded at 2 with fuzz 1 (offset 0 lines). |
129 1 out of 1 hunks FAILED -- saving rejects to file a.rej |
129 fuzz found when applying patch, stopping |
130 patch failed, unable to continue (try -v) |
|
131 patch failed, rejects left in working dir |
|
132 patch didn't work out, merging patcha |
130 patch didn't work out, merging patcha |
133 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
131 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
134 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
132 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
135 (branch merge, don't forget to commit) |
133 (branch merge, don't forget to commit) |
136 applying patcha2 |
134 applying patcha2 |
137 now at: patcha2 |
135 now at: patcha2 |
138 |
136 |