diff mercurial/win32.py @ 19987:ba6486076429 stable

merge: move forgets to the beginning of the action list Forgets need to be in the beginning of the action list, same as removes. This lets us avoid clashes in the dirstate where a directory is forgotten and a file with the same name is added, or vice versa.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 06 Nov 2013 10:20:18 -0800
parents 1b329f8c7b24
children ca6aa8362f33
line wrap: on
line diff