git-resolve.sh: use the $( ... ) construct for command substitution