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
..
bare.c	git_cherry_pick -> git_cherrypick	2014-07-22 10:40:23 -04:00
workdir.c	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