-
This is a helpful suggestion, especially for those of us who have to do 3-way merges on code with long lines. So, how to handle the line editing? Read on for one approach.
Other tools (like BeyondCompare and some tools bundled with versioning systems like Perforce and ClearCase) deal with this by having a "result" pane which is below the "input" panes. The result pane takes up the full width...
2009-11-27 21:07:45 UTC by kferrio
-
This applies to the Copy To {Left|Right} Pane buttons and the Copy From {Left|Right} Pane buttons (sorry, I got the names slightly wrong) and the Shift-Pane-{Left|Right} menu items should be visibly disabled (grayed out) when thee corresponding operation is logically impossible as a result of the source/destination pane being "to the left of Pane 1" or "to the right of Pane N" where N is the...
2009-11-27 20:59:19 UTC by kferrio
-
This is actually a very good suggestion for making diffuse a preferred tool for use with version control systems.
Typically (at least in my experience) the version control system responds to a merge conflict in foo.c (for text files) by creating three scratch copies of the file: foo.c.THIS, foo.c.OTHER and foo.c.BASE (or similar). BASE and OTHER are read-only. The human-driven merge tool (in...
2009-11-26 21:10:32 UTC by kferrio
-
dtmoser committed revision 227 to the Diffuse SVN repository, changing 1 files.
2009-11-06 23:21:33 UTC by dtmoser
-
dtmoser committed revision 226 to the Diffuse SVN repository, changing 11 files.
2009-11-06 02:52:15 UTC by dtmoser
-
dtmoser committed revision 225 to the Diffuse SVN repository, changing 1 files.
2009-11-03 12:51:06 UTC by dtmoser
-
i would like to use this tool with the kde desktop
so it could be nice to have kisalve support or direct ftp file support (urls)
i would like to use it with krusader
but it does not support kioslave files
when saving, it uploads to the remote server too.
2009-10-22 19:58:23 UTC by nadavkav
-
dtmoser committed revision 224 to the Diffuse SVN repository, changing 1 files.
2009-10-22 03:19:08 UTC by dtmoser
-
dtmoser committed revision 223 to the Diffuse SVN repository, changing 1 files.
2009-10-22 03:17:32 UTC by dtmoser
-
dtmoser made 1 file-release changes.
2009-10-13 02:07:02 UTC by dtmoser
