]> git.proxmox.com Git - libgit2.git/commit
merge: default checkout strategy for should be SAFE
authorEdward Thomson <ethomson@microsoft.com>
Wed, 23 Apr 2014 23:26:58 +0000 (19:26 -0400)
committerEdward Thomson <ethomson@microsoft.com>
Wed, 23 Apr 2014 23:42:50 +0000 (19:42 -0400)
commit26564d80aa7b340f07e9c5b96457928ebadcc606
tree33618de26edc2f543a8ac303d0603fa25bdb9fa2
parent212b6205d70ff7c0f0f0b1eda6ac964c8d09d431
merge: default checkout strategy for should be SAFE
src/merge.c
tests/merge/workdir/dirty.c