Carlos Martín Nieto a291790a8d Merge pull request #2831 from ethomson/merge_lock ... merge: lock index during the merge (not just checkout)		2015-02-15 05:18:01 +01:00
..
git2	Merge pull request #2831 from ethomson/merge_lock	2015-02-15 05:18:01 +01:00
git2.h	Make the OpenSSL locking function warnings more severe	2014-12-12 15:46:57 +01:00