]> git.proxmox.com Git - libgit2.git/commit - tests/merge/workdir/dirty.c
Merge pull request #2294 from ethomson/merge_checkout_strategy
authorRussell Belfer <rb@github.com>
Thu, 24 Apr 2014 23:20:08 +0000 (16:20 -0700)
committerRussell Belfer <rb@github.com>
Thu, 24 Apr 2014 23:20:08 +0000 (16:20 -0700)
commitaf9eeac93929bdf10c30e60f34717959d83b6bd3
tree6e4d258f6529d6cb6f9d739eee8305c8912c933b
parent87c9b741dfc5be7edc43625c84720841b65cd14e
parenta4e2c36a66eca49ae4d7bdf0fdba8d4b3c900ab9
Merge pull request #2294 from ethomson/merge_checkout_strategy

Merge checkout strategy