git4idea: using the file revision explicitly rather than inferring it later for merge...