Merge: Fix unread warnings

For the unread local var warnings.

Pull-Request: #1013
Reviewed-by: Lucas Bajolet <r4pass@hotmail.com>
Reviewed-by: Jean Privat <jean@pryen.org>

diff --cc contrib/github_merge.nit
Simple merge

diff --cc lib/template/macro.nit
Simple merge