changeset 23492 | da733837cdd0 |
parent 23483 | 3805f4b0f5a9 |
child 23493 | 28f01c318c05 |
--- a/hgext/largefiles/overrides.py Tue Dec 02 12:23:12 2014 -0800 +++ b/hgext/largefiles/overrides.py Fri Dec 05 16:51:37 2014 -0800 @@ -456,7 +456,7 @@ if repo.ui.promptchoice(usermsg, 0) == 0: # keep local largefile if branchmerge: # largefile can be restored from standin safely - actions['r'].append((lfile, None, 'replaced by standin')) + actions['k'].append((lfile, None, 'replaced by standin')) else: # "lfile" should be marked as "removed" without # removal of itself