From mboxrd@z Thu Jan 1 00:00:00 1970 From: a@9srv.net (Anthony Sorace) Date: Thu, 17 Mar 2011 09:39:30 -0400 Subject: [9fans] anybody figured out a way to use acme as graphical merging tool for hg? In-Reply-To: References: <1388b4f5f7815a0a4684b12a5b647217@smgl.homelinux.net> Message-ID: Topicbox-Message-UUID: bbbba658-ead6-11e9-9d60-3106f5b1d025 On Mar 16, 2011, at 17:30, Iruat? Souza wrote: > adiff may be a good place to look at too. A while ago I also wrote cdiff, which you put in the tag line of an adiff window and it'll plumb successive change pairs, bringing up the relevant sections in each file. It is not well tested, but there's not much to it (thank you, acme). /n/sources/contrib/anothy/bin/rc/cdiff The trickiest part was realizing you have to hold the addr file open to get the changes you expect from writes to ctl; I'd expected that to be the other way around. I don't use it for VCS merges, but it seems like it might be a good starting point for that. Anthony -------------- next part -------------- A non-text attachment was scrubbed... Name: PGP.sig Type: application/pgp-signature Size: 194 bytes Desc: This is a digitally signed message part URL: