Tue, 02 Dec 2014 22:42:41 -0500 Matt Harbison tests: drop unnecessary glob that causes a warning on Windows
Wed, 03 Dec 2014 10:01:24 -0800 Martin von Zweigbergk merge: add test with conflicting file and remote directory rename
Wed, 03 Dec 2014 15:03:29 -0800 Martin von Zweigbergk graft: use a real conflict for the tests
(0) -10000 -3000 -1000 -300 -100 -30 -10 -3 +3 +10 +30 +100 +300 +1000 +3000 +10000 tip