Lines 188-193
Link Here
|
188 |
2) Delete update, keeping original as is |
188 |
2) Delete update, keeping original as is |
189 |
3) Interactively merge original with update |
189 |
3) Interactively merge original with update |
190 |
4) Show differences again |
190 |
4) Show differences again |
|
|
191 |
5) Edit with vimdiff |
191 |
Please select from the menu above (-1 to ignore this update): " |
192 |
Please select from the menu above (-1 to ignore this update): " |
192 |
read my_input |
193 |
read my_input |
193 |
case ${my_input} in |
194 |
case ${my_input} in |
Lines 206-211
Link Here
|
206 |
;; |
207 |
;; |
207 |
4) continue |
208 |
4) continue |
208 |
;; |
209 |
;; |
|
|
210 |
5) vimdiff "${file}" "${ofile}" |
211 |
continue |
212 |
;; |
209 |
*) continue |
213 |
*) continue |
210 |
;; |
214 |
;; |
211 |
esac |
215 |
esac |