Caitlin Potter
							
						 
					 | 
					
						
						
						
						
							
						
						
							37fceda7e8
							
						
					 | 
					
						
						
							
							chore(broccoli): improve overwrite error in merge-trees
						
						
						
						
						
						
						
						Modified the error message to include the relative duplicate path,
to help in diagnosing the cause of the error message.
Closes #2521 
						
						
					 | 
					
						2015-06-16 13:01:35 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Martin Probst
							
						 
					 | 
					
						
						
						
						
							
						
						
							a6e7123995
							
						
					 | 
					
						
						
							
							feat: adjust formatting for clang-format v1.0.19.
						
						
						
						
						
						
					 | 
					
						2015-06-12 09:51:57 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Igor Minar
							
						 
					 | 
					
						
						
						
						
							
						
						
							dc45559c17
							
						
					 | 
					
						
						
							
							build(broccoli): add support for DiffResult#addedPaths
						
						
						
						
						
						
						
						Some plugins want to explicitly know of new paths, so we need to distinguish them from changed paths. 
						
						
					 | 
					
						2015-06-10 11:11:28 -07:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Caitlin Potter
							
						 
					 | 
					
						
						
						
						
							
						
						
							dc8dac7c35
							
						
					 | 
					
						
						
							
							feat(broccoli): improve merge-trees plugin and add "overwrite" option
						
						
						
						
						
						
					 | 
					
						2015-06-05 16:48:54 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Caitlin Potter
							
						 
					 | 
					
						
						
						
						
							
						
						
							4ee3fdaf7f
							
						
					 | 
					
						
						
							
							feat(broccoli): add diffing MergeTrees plugin
						
						
						
						
						
						
						
						Closes #1815
Closes #2064 
						
						
					 | 
					
						2015-06-05 16:48:46 -04:00 | 
					
					
						
						
							
							
							
						
					 |