Use backticks in git-merge-one-file-script instead of $(command).
commitc7d1d4e1b50a60abfec5c5daaeb104bc9838b44c
authorJunio C Hamano <junkio@cox.net>
Sat, 7 May 2005 19:26:15 +0000 (7 12:26 -0700)
committerJunio C Hamano <junkio@cox.net>
Sat, 7 May 2005 19:26:15 +0000 (7 12:26 -0700)
tree2a2c03e51390295f0de47a093fe58117500d6cbd
parent8eef4d3ed13d7604056b26ce58d0db007be530dd
Use backticks in git-merge-one-file-script instead of $(command).

Thomas Glanzmann says that shell he uses on Solaris cannot grok
$(command) but the script does not use nested $(command) and
works happily just by using backticks instead.

Signed-off-by: Junio C Hamano <junkio@cox.net>
git-merge-one-file-script