Mercurial > hg
comparison CONTRIBUTORS @ 18971:c4266e9afc4f
mergetools: avoid losing the merged version with meld
Add -o $output.
When using Meld as intended (merge from left and right into the center panel),
the merged version is written to the wrong file without this option ($base,
a temporary file, which is ignored by Mercurial).
Add meld.check=changed as a secondary safety net.
author | ronvoe12249 <ronny.voelker@elaxy.com> |
---|---|
date | Thu, 21 Feb 2013 14:49:25 +0100 |
parents | c29efd272395 |
children |
comparison
equal
deleted
inserted
replaced
18970:3cdb6f2f6789 | 18971:c4266e9afc4f |
---|