guus.der.kinderenNot XMPP-specific, but as you're all devs: Can someone suggest a good visual diff tool (for linux)? I've not find one to my liking so far
goffikompare
goffior kdiff3
goffiKDE makes great tools in general
flowguus.der.kinderen, meld
jonas’guus.der.kinderen, diff or merge?
guus.der.kinderendiff suffices
guus.der.kinderenmerge would be a bonus
jonas’I like diff | colordiff ;)
jonas’meld is my current favourite for merge, but it needs extra (git) config to work sanely with git
guus.der.kinderenI should have known 🙂
jonas’terrible things happen silently when you use it without that extra config
guus.der.kinderenLike what?
asterixhas left
jonas’guus.der.kinderen, meld gets confused about the direction things are happening in and will auto-merge your new changes away