> On Apr 18, 2018, at 08:32, Tom Hindle <tom_hin...@sil.org> wrote: > > # HG changeset patch > # User hindlemail <tom_hin...@sil.org> > # Date 1523988043 21600 > # Tue Apr 17 12:00:43 2018 -0600 > # Node ID 701f7b1145cb8105428141c22260c89d6b942bef > # Parent 62ebfda864de35f306963989303b70235aa63952 > filemerge: support passing python script to custom merge-tools
Hmm, interesting idea. We're just entering code freeze right now though, so I think this is going to need to wait until after May 1. Please resend then. When you resend, could you do so using patchbomb[1]? [1]: https://www.mercurial-scm.org/wiki/PatchbombExtension pacem in terris / мир / शान्ति / سَلاَم / 平和 Kevin R. Bullock _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel