resolve a conflict

2015-02-10 16:47:11 +03:00 · 2015-02-10 16:47:11 +03:00 · d0c5fdfcae
commit d0c5fdfcae
parent 71f6a3e256 9695ac5418
1 changed files with 5 additions and 0 deletions
--- a/5
+++ b/5
@ -164,6 +164,11 @@ main() {
 			}
 		else
 			file="$target"
 			[[ -f "$file" ]] || {
 				sup.err "No such file: ${file}"
 				return 1
 			}
 		fi
 	fi