]> git.proxmox.com Git - libgit2.git/commit
projects / libgit2.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4f7897a) | patch
checkout rename conflicts
authorEdward Thomson <ethomson@microsoft.com>
Tue, 23 Jul 2013 22:32:42 +0000 (15:32 -0700)
committerEdward Thomson <ethomson@microsoft.com>
Wed, 16 Oct 2013 20:20:10 +0000 (16:20 -0400)
commit96d799aa1830f5fcbacdfd87eca728727561d8e6
tree83d1c7e2a7951263b7bf7b34f45ab08629784999tree
parent4f7897ab19daf6593b35c7f5b4f35403d00530efcommit | diff
checkout rename conflicts

rename conflict tests for checkout conflicts, don't suffix filenames
when checking out with USE_OURS or USE_THEIRS
src/checkout_conflicts.c diff | blob | blame | history
tests-clar/checkout/conflict.c diff | blob | blame | history
The git library used in some Proxmox tool chains