tempfile template fix
merge: call_meld template names fix
merge: ignore pattern fix