thodg/libgit2/tests/resources/merge-recursive/.gitted/index

tests/resources/merge-recursive/.gitted/index

Log

Author Commit Date CI Message
Edward Thomson 34a51428 2015-11-09T11:55:26 merge tests: add complex recursive example
Edward Thomson 86c8d02c 2015-10-22T20:20:07 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.
kmx.io     mail     discord kmxgit v0.4.0