Re: File compare/merge

2013-06-03 Thread Lionello Lunesu
On 4/2/13 3:53, Walter Bright wrote: Life has gotten a lot easier for me trying to manage multiple branches of D since I've been using file compare/merge tools. I use winmerge for Windows, and meld for Linux. They are both free, and work great. What do you use? Under Windows

Re: File compare/merge

2013-04-06 Thread captaindet
On 2013-04-01 14:53, Walter Bright wrote: Life has gotten a lot easier for me trying to manage multiple branches of D since I've been using file compare/merge tools. I use winmerge for Windows, and meld for Linux. They are both free, and work great. What do you use? windows only: i us

Re: File compare/merge

2013-04-06 Thread dennis luehring
Am 01.04.2013 21:53, schrieb Walter Bright: Life has gotten a lot easier for me trying to manage multiple branches of D since I've been using file compare/merge tools. I use winmerge for Windows, and meld for Linux. They are both free, and work great. What do you use? i've us

Re: File compare/merge

2013-04-06 Thread SomeDude
On Monday, 1 April 2013 at 19:53:23 UTC, Walter Bright wrote: Life has gotten a lot easier for me trying to manage multiple branches of D since I've been using file compare/merge tools. I use winmerge for Windows, and meld for Linux. They are both free, and work great. What do you use

Re: File compare/merge

2013-04-04 Thread John Colvin
On Monday, 1 April 2013 at 20:18:36 UTC, Andrei Alexandrescu wrote: On 4/1/13 3:53 PM, Walter Bright wrote: Life has gotten a lot easier for me trying to manage multiple branches of D since I've been using file compare/merge tools. I use winmerge for Windows, and meld for Linux. They are

Re: File compare/merge

2013-04-04 Thread Stewart Gordon
On 02/04/2013 19:32, Kagamin wrote: On Tuesday, 2 April 2013 at 10:44:05 UTC, Stewart Gordon wrote: the compare feature in Notepad++ Would *love* scintilla-based compare tool. Where's the feature? Can't find it. It's a plugin - I think whether it comes pre-installed depends on which Notepad+

Re: File compare/merge

2013-04-03 Thread Jonas Drewsen
In my experience p4merge from Perforce can resolve more conflicts automatically that many of the other tools I've tried. /Jonas

Re: File compare/merge

2013-04-03 Thread Tavi Cacina
On Wednesday, 3 April 2013 at 07:32:27 UTC, Rainer Schuetze wrote: PS: the win32 curl libraries don't seem to support https. Is this correct or do they need some special setup? http://d.puremagic.com/issues/show_bug.cgi?id=9737 SSL usage example: - auto http = HTTP(); // Set the CA certif

Re: File compare/merge

2013-04-03 Thread Rainer Schuetze
On 01.04.2013 22:36, Nick Sabalausky wrote: On Mon, 01 Apr 2013 12:53:23 -0700 Walter Bright wrote: Life has gotten a lot easier for me trying to manage multiple branches of D since I've been using file compare/merge tools. I use winmerge for Windows, and meld for Linux. They are both

Re: File compare/merge

2013-04-02 Thread Vladimir Panteleev
On Tuesday, 2 April 2013 at 10:44:05 UTC, Stewart Gordon wrote: Nowadays, CSDiff, the compare feature in Notepad++, or good old fc, depending on what is best for the circumstances. At least to compare - merging isn't something I've had to do much in my time. Is anybody here writing a file-co

Re: File compare/merge

2013-04-02 Thread Martin Nowak
On 04/01/2013 09:53 PM, Walter Bright wrote: Life has gotten a lot easier for me trying to manage multiple branches of D since I've been using file compare/merge tools. I use winmerge for Windows, and meld for Linux. They are both free, and work great. What do you use? Diffuse becau

Re: File compare/merge

2013-04-02 Thread Martin Nowak
On 04/01/2013 10:18 PM, Andrei Alexandrescu wrote: This morning I installed Octosplit (http://goo.gl/sgNWw) on Chrome this morning Really great unless I have to scroll horizontally but this will hopefully improve.

Re: File compare/merge

2013-04-02 Thread Kagamin
On Tuesday, 2 April 2013 at 10:44:05 UTC, Stewart Gordon wrote: the compare feature in Notepad++ Would *love* scintilla-based compare tool. Where's the feature? Can't find it.

Re: File compare/merge

2013-04-02 Thread Michael
WinMerge on Windows, kdiff on Linux.

Re: File compare/merge

2013-04-02 Thread Stewart Gordon
On 01/04/2013 20:53, Walter Bright wrote: Life has gotten a lot easier for me trying to manage multiple branches of D since I've been using file compare/merge tools. I use winmerge for Windows, and meld for Linux. They are both free, and work great. What do you use? Nowadays, CSDiff

Re: File compare/merge

2013-04-02 Thread Iain Buclaw
On 1 April 2013 20:53, Walter Bright wrote: > Life has gotten a lot easier for me trying to manage multiple branches of > D since I've been using file compare/merge tools. > > I use winmerge for Windows, and meld for Linux. They are both free, and > work great. > > Wh

Re: File compare/merge

2013-04-02 Thread Sergei Nosov
On Monday, 1 April 2013 at 23:06:10 UTC, Jonathan M Davis wrote: On Monday, April 01, 2013 12:53:23 Walter Bright wrote: Life has gotten a lot easier for me trying to manage multiple branches of D since I've been using file compare/merge tools. I use winmerge for Windows, and meld for

Re: File compare/merge

2013-04-01 Thread Jacob Carlborg
On 2013-04-01 21:53, Walter Bright wrote: Life has gotten a lot easier for me trying to manage multiple branches of D since I've been using file compare/merge tools. I use winmerge for Windows, and meld for Linux. They are both free, and work great. What do you use? On Mac OS X, for git

Re: File compare/merge

2013-04-01 Thread Jonathan M Davis
On Monday, April 01, 2013 12:53:23 Walter Bright wrote: > Life has gotten a lot easier for me trying to manage multiple branches of D > since I've been using file compare/merge tools. > > I use winmerge for Windows, and meld for Linux. They are both free, and work > great.

Re: File compare/merge

2013-04-01 Thread Adam Wilson
On Mon, 01 Apr 2013 12:53:23 -0700, Walter Bright wrote: Life has gotten a lot easier for me trying to manage multiple branches of D since I've been using file compare/merge tools. I use winmerge for Windows, and meld for Linux. They are both free, and work great. What do you use

Re: File compare/merge

2013-04-01 Thread Kagamin
http://www.devart.com/codecompare/ It's hoggy, but has syntax highlighting and nice interface.

Re: File compare/merge

2013-04-01 Thread Andrej Mitrovic
On 4/1/13, Nick Sabalausky wrote: > I've been using Beyond Compare Me too. And the obligatory tip for anyone trying to use it with Git: Add this to your .gitconfig file (and make sure you're setting the path to BCompare.exe and not BComp.exe): [diff] t

Re: File compare/merge

2013-04-01 Thread Tobias Pankrath
On Monday, 1 April 2013 at 20:36:08 UTC, Nick Sabalausky wrote: On Mon, 01 Apr 2013 12:53:23 -0700 Walter Bright wrote: Life has gotten a lot easier for me trying to manage multiple branches of D since I've been using file compare/merge tools. I use winmerge for Windows, and meld for

Re: File compare/merge

2013-04-01 Thread Nick Sabalausky
On Mon, 01 Apr 2013 12:53:23 -0700 Walter Bright wrote: > Life has gotten a lot easier for me trying to manage multiple > branches of D since I've been using file compare/merge tools. > > I use winmerge for Windows, and meld for Linux. They are both free, > and work great.

Re: File compare/merge

2013-04-01 Thread Jesse Phillips
On Monday, 1 April 2013 at 19:53:23 UTC, Walter Bright wrote: Life has gotten a lot easier for me trying to manage multiple branches of D since I've been using file compare/merge tools. I use winmerge for Windows, and meld for Linux. They are both free, and work great. What do you use

Re: File compare/merge

2013-04-01 Thread Andrei Alexandrescu
On 4/1/13 3:53 PM, Walter Bright wrote: Life has gotten a lot easier for me trying to manage multiple branches of D since I've been using file compare/merge tools. I use winmerge for Windows, and meld for Linux. They are both free, and work great. What do you use? It's a good

Re: File compare/merge

2013-04-01 Thread Brad Anderson
On Monday, 1 April 2013 at 19:53:23 UTC, Walter Bright wrote: Life has gotten a lot easier for me trying to manage multiple branches of D since I've been using file compare/merge tools. I use winmerge for Windows, and meld for Linux. They are both free, and work great. What do you use

File compare/merge

2013-04-01 Thread Walter Bright
Life has gotten a lot easier for me trying to manage multiple branches of D since I've been using file compare/merge tools. I use winmerge for Windows, and meld for Linux. They are both free, and work great. What do you use?