maxx
/
dotfiles
1
0
Fork 0
Code Releases 0 Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
1003 Commits
2 Branches
464MB
Tree: 35508d7082
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from '35508d7082'
${ noResults }
dotfiles/.config/bin/unison-merge-files

12 lines
324B
Raw Blame History 

  1. #!/bin/sh

  2. CURRENT1=$1

  3. CURRENT2=$2

  4. NEW=$3

  5. CURRENTARCHOPT=$4

  6. EMACS='emacsclient -a "" -ncs default'

  7. if [ x$CURRENTARCHOPT = x ]; then

  8. 	  $EMACS --eval "(emerge-files nil \"$CURRENT1\" \"$CURRENT2\" \"$NEW\")"

  9. else

  10. 	  $EMACS --eval "(emerge-files-with-ancestor nil \"$CURRENT1\" \"$CURRENT2\" \"$CURRENTARCHOPT\" \"$NEW\")"

  11. fi