Make merge writing idempotent
Handle no changes/conflicts situations
Use system look & feel
Adjust layout, change visible terminology from "Left file", "Right file" to "File 1", "File 2"
Add JAXB generation to build.xml
Update readme
Make only left-button, unmasked clicks operate conflict buttons
Prompt when closing MergeWindow, brush up MergeWindow appearance
Include .bat file in dist
Adjust UI
Update README, include in dist