3 Commits

Author	SHA1	Message	Date
Jacques Germishuys	493c340cef	Added test case to illustrate bogus conflicts detected if no files were merged, and untracked files exist in the workdir.	2014-09-12 22:01:22 +02:00
Edward Thomson	0ba4dca526	git_cherry_pick -> git_cherrypick	2014-07-22 10:40:23 -04:00
Jacques Germishuys	103b7d2122	Added cherry pick tests	2014-04-14 16:16:22 +02:00