maxx
/
dotfiles
1
0
Fork 0
Code Releases 0 Activity
Browse Source

Use meld for merging files with unison

master
Maxime Wack 1 year ago
parent
6a195e0663
commit
b86f3f6d06
1 changed files with 2 additions and 1 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -1
      .unison/default.prf

+ 2
- 1
.unison/default.prf View File

@@ -14,4 +14,5 @@ follow = Path Musique

repeat = watch

merge = Name {*,.*} -> unison-merge-files CURRENT1 CURRENT2 NEW CURRENTARCHOPT
# merge = Name {*,.*} -> unison-merge-files CURRENT1 CURRENT2 NEW CURRENTARCHOPT
merge = Name {*,.*} -> meld CURRENT1 CURRENT2

Write Preview
Loading…
Cancel
Save