Commit b60149ecedab39fffc8607896f653ef7ac81b1e2

Edward Thomson 2014-01-31T18:43:50

Tests merge when changes exist in workdir/index