]> git.proxmox.com Git - libgit2.git/commit - src/array.h
Merge pull request #2831 from ethomson/merge_lock
authorCarlos Martín Nieto <cmn@dwim.me>
Sun, 15 Feb 2015 04:18:01 +0000 (05:18 +0100)
committerCarlos Martín Nieto <cmn@dwim.me>
Sun, 15 Feb 2015 04:18:01 +0000 (05:18 +0100)
commita291790a8d42579dafe8684151931847921a9578
tree52d422ca59797b58ec3bf6858d0d9a4af8156346
parenta7fa970f8b216b79a5d237a9d87ac88e2371ae46
parent41fae48df21c7d1140da539cb61fa3fd0598a3e7
Merge pull request #2831 from ethomson/merge_lock

merge: lock index during the merge (not just checkout)
src/index.c
src/merge.c
src/rebase.c