| 
					
						
							
								
								
								
									
									
									
										.gitted
									
								
							
						
					
				 | 
				
					
						
							
							Merge submodules
						
					
				 | 
				2014-01-20 18:07:17 -05:00 | 
			
		
			
			
			
			
				| 
					
						
							
								
								added-in-master.txt
							
						
					
				 | 
				
					
						
							
							Rename tests-clar to tests
						
					
				 | 
				2013-11-14 14:05:52 -08:00 | 
			
		
			
			
			
			
				| 
					
						
							
								
								automergeable.txt
							
						
					
				 | 
				
					
						
							
							Rename tests-clar to tests
						
					
				 | 
				2013-11-14 14:05:52 -08:00 | 
			
		
			
			
			
			
				| 
					
						
							
								
								changed-in-branch.txt
							
						
					
				 | 
				
					
						
							
							Rename tests-clar to tests
						
					
				 | 
				2013-11-14 14:05:52 -08:00 | 
			
		
			
			
			
			
				| 
					
						
							
								
								changed-in-master.txt
							
						
					
				 | 
				
					
						
							
							Rename tests-clar to tests
						
					
				 | 
				2013-11-14 14:05:52 -08:00 | 
			
		
			
			
			
			
				| 
					
						
							
								
								conflicting.txt
							
						
					
				 | 
				
					
						
							
							Rename tests-clar to tests
						
					
				 | 
				2013-11-14 14:05:52 -08:00 | 
			
		
			
			
			
			
				| 
					
						
							
								
								removed-in-branch.txt
							
						
					
				 | 
				
					
						
							
							Rename tests-clar to tests
						
					
				 | 
				2013-11-14 14:05:52 -08:00 | 
			
		
			
			
			
			
				| 
					
						
							
								
								unchanged.txt
							
						
					
				 | 
				
					
						
							
							Rename tests-clar to tests
						
					
				 | 
				2013-11-14 14:05:52 -08:00 |