git-merge: do up-to-date check also for all strategies