Some comments about DiffMerge

[diffmerge]

Hi all,

I am trying to use DiffMerge after I read about in Eric's blog. I wonder why it doesn't allow me to "apply change from right" to left, when the difference is actually addition?

For example:
FileLeft:
1:line1
2:line2
FileRight:
1:line1

All I can do is insert text "line2" from left to right. But if the deletion is the actual change I want, looks like there's no way to do it.

And why I can't edit the left file at all?

Overall, your tool seems promising, but you may probably should take a look at WinMerge for some inspiration about functions and UI (keyboard shortcuts also).

Good luck!

[lbauer]

Our Diff/Merge allows editing in the right panel in a 2-way file diff
and the middle panel in a 3-way file merge.

The files in the other panels are considered read-only.

The previous version, SGDiff/Merge, allowed all panels to be
edited, but we found that that ability caused some confusion, so
we decided to focus attention on the single editable file within the set.

This means the user's mindset would be on editing a single
file using reference material from the other file(s) rather
than trying to simultaneously edit 2 or 3 files.

For instance, if you're diffing or merging a file under source control,
the focus would be on editing the version to be checked in,
rather than the repository version of the file, or the common parent in a merge.