equal
deleted
inserted
replaced
108 $ echo This is file b22 > b |
108 $ echo This is file b22 > b |
109 merge fails |
109 merge fails |
110 $ hg merge 2 |
110 $ hg merge 2 |
111 abort: outstanding uncommitted changes (use 'hg status' to list changes) |
111 abort: outstanding uncommitted changes (use 'hg status' to list changes) |
112 [255] |
112 [255] |
113 $ echo %% merge expected! |
113 merge expected! |
114 %% merge expected! |
|
115 $ hg merge -f 2 |
114 $ hg merge -f 2 |
116 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
115 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
117 (branch merge, don't forget to commit) |
116 (branch merge, don't forget to commit) |
118 $ hg diff --nodates |
117 $ hg diff --nodates |
119 diff -r 85de557015a8 b |
118 diff -r 85de557015a8 b |