Merge branch 'bs/lock'
commit922b0e35b9622d81732f4cb6db4862d17ebf1855
authorJunio C Hamano <gitster@pobox.com>
Mon, 30 Jul 2007 06:09:54 +0000 (29 23:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 Jul 2007 06:09:54 +0000 (29 23:09 -0700)
tree9e19dff9235f52a3d5698524f0ba52f01abbe4da
parentb8de7f764e1a9f6e8dfb587a6145906394fa607d
parent65a5a21d024373674d6068a03c71558035775e0c
Merge branch 'bs/lock'

* bs/lock:
  Add test for symlinked configuration file updates.
  use lockfile.c routines in git_commit_set_multivar()
  fully resolve symlinks when creating lockfiles