ananthakumaran / monky

Magit for Hg
http://ananthakumaran.in/monky/index.html
GNU General Public License v3.0
154 stars 30 forks source link

allow for diff/ediff of modified merged item #115

Open dsadinoff opened 2 months ago

dsadinoff commented 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.