Roadmap

What’s coming next

Version 1.0 focused on getting compare and merge right. Here is the work planned after it, in the order we expect to tackle it.

Plans, not promises

Everything on this page is planned, not scheduled. There are no release dates, and items may move between phases, change or be dropped. What has actually shipped is always in the changelog.

  1. Released

    1.0: compare and merge

    Shipped

    Text, folder and hex compare, 3-way merge, headless CLI and TortoiseGit / git integration. Release notes · Features

  2. Phase 1

    Quick wins

    Planned

    Small features that build on what is already there, plus the groundwork the later phases need: saved settings, an application menu and shortcut presets.

    • Go to line (Ctrl+G) and cursor position in the status bar
    • Show whitespace, tabs and line-ending glyphs
    • Option to show line-ending differences, and a per-pane line-ending converter
    • Copy a change and jump to the next one
    • Jump to the first / last difference, and to the first difference on open
    • Character or word highlighting toggle
    • Zoom and font size
    • Recent comparisons on the Home screen
    • Compare the clipboard or pasted text, and read from stdin
    • Type-ahead name filter in folder compare
    • Export a unified diff or copy it as a patch
    • Mark as resolved, and more TortoiseGitMerge switches (/automerge, /saverequired, /line:N)
    • Application menu, with shortcut presets for Beyond Compare, TortoiseGitMerge and WinMerge users
    • +/− markers so changes don’t rely on colour alone
    • A no-telemetry statement inside the app

  3. Phase 2

    Editor upgrade

    Planned

    A real code editor component in every pane. The diff engine stays the same, so results keep matching git.

    • Full multi-line editing: select, paste and type across lines
    • Find and replace, with regular expressions
    • Syntax highlighting with language detection
    • Word wrap that keeps both panes aligned
    • Tab width and tabs-vs-spaces settings
    • Collapse unchanged regions
    • One-pane inline (unified) view
    • Free editing of the merge output, with live conflict detection
    • Per-pane encoding selector
    • Highlight all occurrences of a word
    • Screen-reader friendly navigation between differences

  4. Phase 3

    Diff quality & merge

    Planned

    Smarter diffs and faster conflict resolution, with every new algorithm checked against git where git has an equivalent.

    • Regex line filters with presets, and substitution filters
    • Dim unimportant changes such as comments
    • Manual alignment (sync points)
    • Patience and histogram diff algorithms
    • Better pairing of similar lines, and moved-block detection
    • Open a file that already contains conflict markers
    • Pick individual lines, with per-side checkboxes
    • One-click resolution of simple and whitespace-only conflicts
    • Take a whole file from one side
    • Rules-based folder compare, .gitignore-aware filtering, include masks and saved filters
    • Per-file-type rules
    • More Beyond Compare command-line switches

  5. Phase 4

    Breadth

    Planned

    More ways to compare, and a better fit with Windows and other version control systems.

    • Tabs, and optional reuse of one window, each caller still getting its own exit code
    • Settings dialog
    • Folder file operations: copy, move, rename, delete to the Recycle Bin
    • Peek pane, sortable and resizable columns, progress and cancel
    • 3-way folder compare, and sync / mirror with preview
    • Explorer context menu
    • Installer
    • Integration scripts for TortoiseSVN, SVN, Mercurial and Perforce
    • Patch viewer and patch apply
    • Image compare, and CSV / table compare
    • HTML and folder reports, print and PDF
    • Hex: insertion-aware alignment and search
    • Multi-file changeset view
    • Accessibility improvements and translations

Missing something you need? Check the FAQ or the support page.

Download v1.0.1