Differences From Artifact [a543d22229]:
- File Changes — part of check-in [ab1da68c44] at 2010-06-23 20:33:56 on branch trunk — Support -noempty from DiffUtil. (user: peter.spjuth@gmail.com size: 6173)
To Artifact [08ca0d408d]:
- File Changes — part of check-in [5995a4b5f7] at 2010-11-07 18:37:51 on branch table-list — Autodetect line endings in conflict file. Allow line ending selection in merge save. [FR 5160] Added menu bar to merge window. (user: peter.spjuth@gmail.com size: 6315) [more...]
|