mirror of
				https://github.com/cmderdev/cmder.git
				synced 2025-11-04 11:22:13 +08:00 
			
		
		
		
	Merge branch 'development' of https://github.com/cmderdev/cmder into development
This commit is contained in:
		
							
								
								
									
										7
									
								
								vendor/lib/lib_path.cmd
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										7
									
								
								vendor/lib/lib_path.cmd
									
									
									
									
										vendored
									
									
								
							@@ -250,16 +250,9 @@ exit /b
 | 
				
			|||||||
    )
 | 
					    )
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    for /d %%i in ("%add_path%\*") do (
 | 
					    for /d %%i in ("%add_path%\*") do (
 | 
				
			||||||
<<<<<<< HEAD
 | 
					 | 
				
			||||||
        %print_debug% :set_path_recursive "Env Var BEFORE - depth=%depth%"
 | 
					        %print_debug% :set_path_recursive "Env Var BEFORE - depth=%depth%"
 | 
				
			||||||
        %print_debug% :set_path_recursive "Found Subdirectory - '%%~fi'"
 | 
					        %print_debug% :set_path_recursive "Found Subdirectory - '%%~fi'"
 | 
				
			||||||
        call :set_path_recursive "%%~fi" %depth% %max_depth% %position%
 | 
					        call :set_path_recursive "%%~fi" %depth% %max_depth% %position%
 | 
				
			||||||
        %print_debug% :set_path_recursive "Env Var AFTER- depth=%depth%"
 | 
					        %print_debug% :set_path_recursive "Env Var AFTER- depth=%depth%"
 | 
				
			||||||
=======
 | 
					 | 
				
			||||||
        %print_debug% :enhance_path_recursive "Env Var BEFORE - depth=%depth%"
 | 
					 | 
				
			||||||
        %print_debug% :enhance_path_recursive "Found Subdirectory - '%%~fi'"
 | 
					 | 
				
			||||||
        call :enhance_path_recursive "%%~fi" %depth% %max_depth% %position%
 | 
					 | 
				
			||||||
        %print_debug% :enhance_path_recursive "Env Var AFTER- depth=%depth%"
 | 
					 | 
				
			||||||
>>>>>>> 126347025f9cade241beff182738b2527da7535e
 | 
					 | 
				
			||||||
    )
 | 
					    )
 | 
				
			||||||
    exit /b
 | 
					    exit /b
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user