]> git.proxmox.com Git - libgit2.git/commit
projects / libgit2.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 76ade3a) | patch
merge tests: move expected data into own file
authorEdward Thomson <ethomson@edwardthomson.com>
Mon, 9 Nov 2015 13:23:27 +0000 (08:23 -0500)
committerEdward Thomson <ethomson@microsoft.com>
Wed, 25 Nov 2015 20:38:22 +0000 (15:38 -0500)
commitdcde5720424961f526e8c070b7d99191d7ef75c1
tree5dcd085a370ce66bb9cd39aa280e61676716ef57tree
parent76ade3a0b87e279935eba54be2485105396edb7fcommit | diff
merge tests: move expected data into own file
tests/merge/conflict_data.h [new file with mode: 0644] blob
tests/merge/files.c diff | blob | blame | history
tests/merge/merge_helpers.h diff | blob | blame | history
tests/merge/trees/automerge.c diff | blob | blame | history
tests/merge/trees/commits.c diff | blob | blame | history
tests/merge/workdir/simple.c diff | blob | blame | history
The git library used in some Proxmox tool chains