Show More
@@ -65,8 +65,8 b' def checkunknown(wctx, mctx):' | |||||
65 | for f in wctx.unknown(): |
|
65 | for f in wctx.unknown(): | |
66 | if f in man: |
|
66 | if f in man: | |
67 | if mctx.filectx(f).cmp(wctx.filectx(f).data()): |
|
67 | if mctx.filectx(f).cmp(wctx.filectx(f).data()): | |
68 |
raise util.Abort(_("'%s' |
|
68 | raise util.Abort(_("untracked local file '%s' differs"\ | |
69 |
" |
|
69 | " from remote version") % f) | |
70 |
|
70 | |||
71 | def forgetremoved(wctx, mctx): |
|
71 | def forgetremoved(wctx, mctx): | |
72 | """ |
|
72 | """ |
@@ -10,7 +10,7 b' diff -r d9e5953b9dec b' | |||||
10 | M b |
|
10 | M b | |
11 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
11 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
12 | %% merge should fail |
|
12 | %% merge should fail | |
13 | abort: 'b' already exists in the working dir and differs from remote |
|
13 | abort: untracked local file 'b' differs from remote version | |
14 | %% merge of b expected |
|
14 | %% merge of b expected | |
15 | merging for b |
|
15 | merging for b | |
16 | merging b |
|
16 | merging b |
General Comments 0
You need to be logged in to leave comments.
Login now