kmx git

tests/cherrypick

Commit	Date	Message
493c340c	2014-09-12T21:59:09	Added test case to illustrate bogus conflicts detected if no files were merged, and untracked files exist in the workdir.
0ba4dca5	2014-07-22T10:40:23	git_cherry_pick -> git_cherrypick
103b7d21	2014-04-02T13:57:11	Added cherry pick tests