summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-08-13 01:34:36 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-08-13 01:35:14 (GMT)
commiteed94a570e0421175d6b4342c0ac48e03ceedf0b (patch)
treef33864f2abffdcb83cbf626b26da34f9cc8d5bab /.gitignore
parent4147d801db66df9b127ffe315601f467aa9d1c48 (diff)
parent01aaf1f88ddc2b99162c302710339f202996f39b (diff)
downloadgit-eed94a570e0421175d6b4342c0ac48e03ceedf0b.zip
git-eed94a570e0421175d6b4342c0ac48e03ceedf0b.tar.gz
git-eed94a570e0421175d6b4342c0ac48e03ceedf0b.tar.bz2
Merge branch 'master' into js/c-merge-recursive
Adjust to hold_lock_file_for_update() change on the master.
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions