This change was suggested for my git-switch-tree script, so it probably 
applies to core git's git-resolve-script as well.