Merge not merged...

[Kevin]

I have performed a merge of my default branch from another branch.
Many of the files show large differences when I do
hg diff -r default

hg status does not show any any unmerged files.
The merge seems like it was completed, yet the differences remain.

What do I need to do to resolve this?

Thanks for any help or direction.

Kev



--
View this message in context: http://mercurial.808500.n3.nabble.com/Merge-not-merged-tp3992816.html
Sent from the General mailing list archive at Nabble.com.