simplify the way we pass DiffAlgorithm to splitters
2 patches for repository darcs-unstable@darcs.net:screened:

patch 40548bf8aa56e5038762e65be59c1b399b490600
Author: Ganesh Sittampalam <ganesh@earth.li>
Date:   Sun Sep 13 15:28:26 BST 2015
  * capture diffAlgorithm in splitters instead of passing it to SelectChanges unconditionally

patch fe2f003cce0b8a30c7beafb93221af9978a95487
Author: Ganesh Sittampalam <ganesh@earth.li>
Date:   Sat Jan 16 14:49:48 GMT 2016
  * resolve conflicts between changes to splitters and to hijacking

Attachments

• capture-diffalgorithm-in-splitters-instead-of-passing-it-to-selectchanges-unconditionally.dpatch
• patch-preview.txt
• unnamed

I reviewed both patch together because showing the diff of the
conflicting patch only (without resolution patch) shows incorrect stuff.
So I did:

    darcs diff --from-hash 40548bf8aa  --to-hash fe2f003cce

* capture diffAlgorithm in splitters instead of passing it to
SelectChanges unconditionally

The changes of the patch is to removes the diffAlgorithm field
from the SelectChagnes and put this option instead of splitters. The
result is that UI commands that do not need to edit hunks (for instance,
pull, push) no longer have to specify a diff algorithm to call interactive
selection. This is a nice change. And tests pass.

Accepted.