diff -r a1aad25ccc3e -r 49966b5ab16f hgext/extdiff.py --- a/hgext/extdiff.py Tue Oct 10 00:02:30 2006 +0200 +++ b/hgext/extdiff.py Wed Oct 11 16:35:09 2006 +0200 @@ -65,6 +65,9 @@ ui.write_err(_('making snapshot of %d files from rev %s\n') % (len(files), short(node))) for fn in files: + if not fn in mf: + # skipping new file after a merge ? + continue wfn = util.pconvert(fn) ui.note(' %s\n' % wfn) dest = os.path.join(base, wfn)