summaryrefslogtreecommitdiff
path: root/xdiff-interface.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-07-30 06:09:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-07-30 06:09:54 (GMT)
commit922b0e35b9622d81732f4cb6db4862d17ebf1855 (patch)
tree9e19dff9235f52a3d5698524f0ba52f01abbe4da /xdiff-interface.h
parentb8de7f764e1a9f6e8dfb587a6145906394fa607d (diff)
parent65a5a21d024373674d6068a03c71558035775e0c (diff)
downloadgit-922b0e35b9622d81732f4cb6db4862d17ebf1855.zip
git-922b0e35b9622d81732f4cb6db4862d17ebf1855.tar.gz
git-922b0e35b9622d81732f4cb6db4862d17ebf1855.tar.bz2
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
Diffstat (limited to 'xdiff-interface.h')
0 files changed, 0 insertions, 0 deletions