New changeset in mercurial: http://selenic.com/repo/hg//rev/40800668e019 changeset: 20994:40800668e019 tag: tip user: Mads Kiilerich <madski at unity3d.com> date: Mon Apr 07 23:10:20 2014 +0200 summary: largefiles: don't prompt when one side of merge was changed but didn't change -- Repository URL: http://selenic.com/repo/hg/