Merge branch 'master' into next

Conflicts:
	testcases/t/173-get-marks.t
This commit is contained in:
Michael Stapelberg
2011-12-17 14:22:57 +00:00
3 changed files with 27 additions and 15 deletions

View File

@ -35,16 +35,4 @@ cmd 'kill';
is_deeply(get_marks(), [ ], 'mark gone');
##############################################################
# 4: check that duplicate marks are included twice in the get_marks reply
##############################################################
cmd 'open';
cmd 'mark bar';
cmd 'open';
cmd 'mark bar';
is_deeply(get_marks(), [ 'bar', 'bar' ], 'duplicate mark found twice');
done_testing;