4 Commits

Author	SHA1	Message	Date
Ben Straub	5c8be32559	Fix a few references to changed function signatures	2014-02-05 13:32:45 -08:00
Edward Thomson	bb13d39162	Test that emulates a strange filter implementation	2014-02-03 19:56:34 -08:00
Edward Thomson	16eb8b7c06	Tests merging staged files identical to result	2014-02-03 19:56:34 -08:00
Edward Thomson	b60149eced	Tests merge when changes exist in workdir/index	2014-02-03 19:56:33 -08:00