]> git.proxmox.com Git - libgit2.git/commit
projects / libgit2.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: cdb6c1c) | patch
merge: add a third-level recursive merge
authorEdward Thomson <ethomson@edwardthomson.com>
Mon, 26 Oct 2015 21:25:42 +0000 (17:25 -0400)
committerEdward Thomson <ethomson@microsoft.com>
Wed, 25 Nov 2015 20:37:28 +0000 (15:37 -0500)
commita200bcf72838488c1550b1709a3f075f722e0244
treeaa631228900dbb2168ab1063b17c1fd4fbd57ff3tree
parentcdb6c1c83dd6f0d30b798a7f62d4f3849a1f11a1commit | diff
merge: add a third-level recursive merge
13 files changed:
tests/merge/trees/recursive.c diff | blob | blame | history
tests/resources/merge-recursive/.gitted/objects/00/7f1ee2af8e5d99906867c4237510e1790a89b8 [new file with mode: 0644] blob
tests/resources/merge-recursive/.gitted/objects/15/faa0c9991f2d65686e844651faa2ff9827887b [new file with mode: 0644] blob
tests/resources/merge-recursive/.gitted/objects/4d/fc1be85a9d6c9898152444d32b238b4aecf8cc [new file with mode: 0644] blob
tests/resources/merge-recursive/.gitted/objects/50/e4facaafb746cfed89287206274193c1417288 [new file with mode: 0644] blob
tests/resources/merge-recursive/.gitted/objects/5e/8747f5200fac0f945a07daf6163ca9cb1a8da9 [new file with mode: 0644] blob
tests/resources/merge-recursive/.gitted/objects/5f/18576d464946eb2338daeb8b4030019961f505 [new file with mode: 0644] blob
tests/resources/merge-recursive/.gitted/objects/ad/1ea02c2cc4f55c1dff87b80a086206a73885eb [new file with mode: 0644] blob
tests/resources/merge-recursive/.gitted/objects/ca/49d1a8b6116ffeba22667bba265fa5261df7ab [new file with mode: 0644] blob
tests/resources/merge-recursive/.gitted/objects/e1/dcfc3038be54195a59817c89782b261e46cb05 [new file with mode: 0644] blob
tests/resources/merge-recursive/.gitted/objects/f1/b44c04989a3a1c14b036cfadfa328d53a7bc5e [new file with mode: 0644] blob
tests/resources/merge-recursive/.gitted/refs/heads/branchD-1 [new file with mode: 0644] blob
tests/resources/merge-recursive/.gitted/refs/heads/branchD-2 [new file with mode: 0644] blob
The git library used in some Proxmox tool chains