v0.7.3

Changed

• Bundle extension with Parcel
• Include only necessary files in the package

v0.7.2

Added

• Command “Switch diff layout temporarily…”; also available on the status bar.
  Reapplied from v0.7.0 with fixes.

Fixed

• Diff editor layouts were being reopened on closing them
  when some extensions were enabled which caused additional “open” events.
• Prevent a seeming deadlock (“…other operation pending…”)
  by making the dialog asking for reset confirmation modal.

v0.7.1

Fixed

• Reverted addition of command “Switch diff layout temporarily…”

v0.7.0

Added

• Layout 3DiffToBaseMergedRight with the merged file editor
  taking up the whole right half.
• Command “Switch diff layout temporarily…”; also available on the status bar
• Synchronization of the cursor position
• Command “Reset temporary settings activated on diff layout start”
  in case one has two VS Code instances open,
  activates a diff layout in one instance and simply closes it afterwards.

Changed

• Merge the best of the scroll synchronization methods
  centered and interval into one, replacing them.

Fixed

• Do not create a backup on close when the merged file is unchanged.

v0.6.0

This will be the first version published on the
Marketplace.

Added

• Layout 3DiffToBaseRows, which is useful for long lines.
• Show message about git commit result.

Changed

• Use node-pty to host git mergetool more reliably.

v0.5.0

Added

• Asking for confirmation and creating a backup when skipping a file,
  as git mergetool automatically resets any changes made to the merged file
  when telling git mergetool that the merge was not successful.
• Also creating a backup when VS Code is closed
  while git mergetool is running.
• Showing by which number an editor is reachable in the title
  (reachable using ctrl+<number>)
• When git mergetool does not seem to respond, show the terminal.
  That way the other merge conflict types
  (symbolic links, directories and submodules)
  can be (with some care) managed.
• Prevent “Terminal process exited …” message from VS Code

Changed

• Shorter editor titles

Fixes

• Reopening the layout by using the start command failed
• Various issues with the process management

v0.4.0

Added

• Keybindings: Most functionality is now available as keyboard shortcuts
  by first typing shift+alt+m and then a single letter.
• Powerful new command: “Start mergetool, go to next conflict, or do commit”.
  This combines several commands of the extension into one
  and guides through the whole merge process.
• Terminal process detached from renderer process,
  allowing to cleanly shut down git mergetool when VS Code is closed,
  deleting the temporary merge conflict files in the process.

Changed

• Slight optimization of the speed of the diff layout stop

Fixed

• Large reworking of the mergetool process management, fixing several bugs

v0.3.0

Changed

• Scroll synchronization method by default is now the new “interval” method.
  The ID and meaning of the setting have changed
  and so the setting will be reset to the default.

Added

• Scroll synchronization method “interval”
• Reset settings directly on VS Code startup
• Also disable glyph margin and activity bar during diff layout
• Merge arbitrary files: Allow to select an existing file for merge
• Message when no merge conflicts exist on opening a diff layout

Fixed

• Change settings synchronously to prevent confused VS Code and congestion
• Several small bugs discovered thanks to stricter linting

v0.2.2

Fixed

• Use the global storage instead of the workspace storage
  for restoring settings
• Wrong setting type declared for scrollingSynchronizedAt

v0.2.1

Added

• Disable tabs during editor layout

Fixed

• Automatic upload of releases