search

facebook / sapling

A Scalable, User-Friendly Source Control System.
https://sapling-scm.com
GNU General Public License v2.0
6.18k stars 285 forks source link

[ n00b ] change default merge conflict tool #925

Open braedontask opened 4 months ago

braedontask commented 4 months ago

i dont want to use filemerge for conflicts after running sl rebase. would prefer to just resolve the flags in my default editor. is there some simple config im missing here?

former facebooker. love sapling btw! lmk if you need contributors.

quark-zju commented 4 months ago

Try rebase -t :merge or configure sl config --local ui.merge:interactive=:merge to set it permanently.

muirdm commented 4 months ago

You can configure ui.merge:interactive to your preferred merge method (see sl help merge-tools). For example. sl config --user ui.merge:interactive=:merge3 which will leave three way merge markers in the file if there are conflicts.

The default tool should be "editmerge" which is what I use. It opens the conflicts automatically in your editor to let you go through them quickly (need to configure ui.editor to choose your editor).

bolinfest commented 3 months ago

There aren't specific docs for this on https://sapling-scm.com/ are there?