Makefile: use merge time when restoring mtime
This change allows to better control when files are considered out of date by make
by taking into account the time of a merge commit
This change allows to better control when files are considered out of date by make
by taking into account the time of a merge commit