Mercurial > hg
diff contrib/mergetools.hgrc @ 20994:40800668e019
largefiles: don't prompt when one side of merge was changed but didn't change
This can happen after backout or grafts or criss cross merges. We already do
the same (but slightly different) thing in manifestmerge and filemerge.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Mon, 07 Apr 2014 23:10:20 +0200 |
| parents | 3de9b1f9ebc3 |
| children | 12c7cea6235c |