Open dsadinoff opened 2 months ago
hg is perfectly happy to tell me the diff for an item that was just merged, and not committed, but monky refuses. Not sure why.
"cannot ediff an unmodified file during a merge"
Perhaps monky is confused, because the file is merged and listed as "modified", but the error message says otherwise.
hg is perfectly happy to tell me the diff for an item that was just merged, and not committed, but monky refuses. Not sure why.
"cannot ediff an unmodified file during a merge"
Perhaps monky is confused, because the file is merged and listed as "modified", but the error message says otherwise.