libgit2/tests/resources/merge-recursive/.gitted/refs/heads/branchA-1
Edward Thomson 86c8d02c07 merge: add simple recursive test
Add a simple recursive test - where multiple ancestors exist and
creating a virtual merge base from them would prevent a conflict.
2015-11-25 15:37:11 -05:00

2 lines
41 B
Plaintext

539bd011c4822c560c1d17cab095006b7a10f707