changeset 11702 | eb07fbc21e9c |
parent 11470 | 34e33d50c26b |
child 11717 | a286a4ecbfeb |
--- a/mercurial/merge.py Wed Jul 28 11:07:20 2010 +0200 +++ b/mercurial/merge.py Tue Jul 27 23:40:46 2010 +0900 @@ -73,7 +73,7 @@ def _checkunknown(wctx, mctx): "check for collisions between unknown files and files in mctx" for f in wctx.unknown(): - if f in mctx and mctx[f].cmp(wctx[f].data()): + if f in mctx and mctx[f].cmp(wctx[f]): raise util.Abort(_("untracked file in working directory differs" " from file in requested revision: '%s'") % f)