dotfiles
bugabingas dorkfiles
owned by bugabinga
pacnew.nu: reverse order of merge files
e304d8562ee1c5199640ccf52b1bca5f94f94cf5
Oliver Jan Krylow <olver@bugabinga.net> ·
unsigned
Browse filesCompare with HEAD
the original file is now on the left.
also clarified the wording of messages when merging files.
Changed files (1)
nushell/modules/pacnew.nu
Modified12 12 let original_tmp =
"/tmp/" + (
$original | path basename )
13 13 cp
$pacnew_to_merge $pacnew_tmp 14 14 cp
$original $original_tmp 15 - meld --label
$pacnew_to_merge $pacnew_tmp --label
$original $original_tmp 15 + meld --label
$original $original_tmp --label
$pacnew_to_merge $pacnew_tmp 16 16 let success = ( input
"Merged? [yN] " )
17 17 if (
$success | str downcase | str contains
'y' ) {
18 - echo $
"Saving merged ($pacnew_to_merge) to ($original)" 18 + echo $
"Merged ($original) with ($pacnew_to_merge)" 19 19 doas mv
$original_tmp $original 20 20 doas rm
$pacnew_to_merge 22 - echo $
"Merge of ($pacnew_to_merge) aborted." 22 + echo $
"Merge of ($original) aborted."