kmx git

tests/cherrypick

Commit	Date	Message
59fbaa4b	2014-09-24T11:20:43	cherrypick: the name is still git_cherry_pick A backported fix makes use of the new name for git_cherry_pick (namely git_cherrypick), but we still need to use the old one in the maint branch.
edb2b835	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.
103b7d21	2014-04-02T13:57:11	Added cherry pick tests