equal
deleted
inserted
replaced
108 [255] |
108 [255] |
109 |
109 |
110 $ hg up -r '.^' --config ui.interactive=True << EOF |
110 $ hg up -r '.^' --config ui.interactive=True << EOF |
111 > d |
111 > d |
112 > EOF |
112 > EOF |
113 file 'b' was deleted in other [destination] but was modified in local [working copy]. |
113 file 'b' was deleted in local [working copy] but was modified in other [destination]. |
114 What do you want to do? |
114 What do you want to do? |
115 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? d |
115 use (c)hanged version, leave (d)eleted, or leave (u)nresolved? d |
116 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
116 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
117 |
117 |
118 XXX: There's a difference between wdir() and '.', so there should be a status. |
118 XXX: There's a difference between wdir() and '.', so there should be a status. |