summaryrefslogtreecommitdiff
path: root/src/vector.h
diff options
context:
space:
mode:
authorCarlos Martín Nieto <cmn@dwim.me>2015-02-15 05:18:01 +0100
committerCarlos Martín Nieto <cmn@dwim.me>2015-02-15 05:18:01 +0100
commita291790a8d42579dafe8684151931847921a9578 (patch)
tree52d422ca59797b58ec3bf6858d0d9a4af8156346 /src/vector.h
parenta7fa970f8b216b79a5d237a9d87ac88e2371ae46 (diff)
parent41fae48df21c7d1140da539cb61fa3fd0598a3e7 (diff)
downloadlibgit2-a291790a8d42579dafe8684151931847921a9578.tar.gz
Merge pull request #2831 from ethomson/merge_lock
merge: lock index during the merge (not just checkout)
Diffstat (limited to 'src/vector.h')
0 files changed, 0 insertions, 0 deletions