5 Commits

Author	SHA1	Message	Date
Linquize	18bd73e50d	Fix warning in tests-clar/merge/workdir/trivial.c	2013-11-11 00:08:54 +08:00
nulltoken	8d22773f4b	Plug git_merge() related leaks	2013-11-05 17:30:11 +01:00
Edward Thomson	039db728f3	merge branch into current, updating workdir	2013-11-05 10:00:39 -05:00
Edward Thomson	9c06b25054	merge setup	2013-05-17 08:26:24 -05:00
Edward Thomson	bec65a5e99	merge!	2013-04-30 15:31:31 -05:00