thodg/libgit2/tests/merge/workdir/submodules.c

---

tests/merge/workdir/submodules.c

---

Log

Author	Commit	Date	CI	Message
	d9fdee6e	2014-03-12T09:43:53		Remove `git_merge_result` as it's now unnecessary
	02105a27	2014-03-11T18:40:38		Change signature of `git_merge` to take merge and checkout opts
	586be3b8	2014-02-03T15:05:55		Add reflog parameters to git_reset
	0ef19fe1	2014-01-20T17:13:55		Merge submodules