From: Michael Stapelberg <michael@stapelberg.de>
Date: Sat, 17 Dec 2011 14:22:57 +0000 (+0000)
Subject: Merge branch 'master' into next
X-Git-Tag: 4.2~184
X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3;a=commitdiff_plain;h=ef224cdb988f9d8ba4d98f66f1a38e5fe80ba3cd

Merge branch 'master' into next

Conflicts:
	testcases/t/173-get-marks.t
---

ef224cdb988f9d8ba4d98f66f1a38e5fe80ba3cd
diff --cc testcases/t/173-get-marks.t
index 75b6e7a8,007d5a6d..e8964d30
--- a/testcases/t/173-get-marks.t
+++ b/testcases/t/173-get-marks.t
@@@ -33,18 -33,6 +33,6 @@@ is_deeply(get_marks(), [ 'foo' ], 'mar
  
  cmd 'kill';
  
 -cmp_deeply(get_marks(), [ ], 'mark gone');
 +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;