bug
This commit is contained in:
		
							parent
							
								
									a85cd2faf4
								
							
						
					
					
						commit
						7b12600848
					
				
							
								
								
									
										3
									
								
								bin/pdev
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								bin/pdev
									
									
									
									
									
								
							| @ -107,6 +107,7 @@ EOF | |||||||
| fi | fi | ||||||
| EOF | EOF | ||||||
| 
 | 
 | ||||||
|  |     [ -n "$Delete" -o -z "$ShouldDelete" ] && Deleted=1 || Deleted= | ||||||
|     [ -n "$ShouldDelete" -a -n "$Delete" ] && ShouldDelete= |     [ -n "$ShouldDelete" -a -n "$Delete" ] && ShouldDelete= | ||||||
|     [ -n "$ShouldPush" -a -n "$Push" ] && ShouldPush= |     [ -n "$ShouldPush" -a -n "$Push" ] && ShouldPush= | ||||||
|     if [ -n "$_Fake" ]; then |     if [ -n "$_Fake" ]; then | ||||||
| @ -119,7 +120,7 @@ En cas d'erreur de merge, veuillez corriger les erreurs puis continuer avec | |||||||
| Sinon, veuillez consulter le script et/ou le relancer | Sinon, veuillez consulter le script et/ou le relancer | ||||||
|     ./$script${Delete:+ delete}${Push:+ push}" |     ./$script${Delete:+ delete}${Push:+ push}" | ||||||
|         die |         die | ||||||
|     elif [ -n "$Delete" -a -n "$Push" ]; then |     elif [ -n "$Deleted" -a -n "$Push" ]; then | ||||||
|         [ -n "$_KeepScript" ] || rm "$script" |         [ -n "$_KeepScript" ] || rm "$script" | ||||||
|     else |     else | ||||||
|         einfo "\ |         einfo "\ | ||||||
|  | |||||||
		Reference in New Issue
	
	Block a user