git merge when confilict 

1
2
3
git show :1:hello.rb > hello.common.rb
git show :2:hello.rb > hello.ours.rb
git show :3:hello.rb > hello.theirs.rb

git show a file in commit

1
2
git show f73e742aa7a0952dda8b1a7ec3a1b66e9bbfd2a6:Makefile
git show f73e742aa7a0952dda8b1a7ec3a1b66e9bbfd2a6:src/sdt_acl.c