View Bazaar branches
Get this repository:
git clone https://git.launchpad.net/turnip
Members of Canonical Launchpad Branches can upload to this repository. Log in for directions.

Branches

Name Last Modified Last Commit
master 2017-11-02 11:24:47 UTC 2017-11-02
Fix compare-merge crash on modify/delete conflicts

Author: Colin Watson
Author Date: 2017-11-02 11:24:47 UTC

Fix compare-merge crash on modify/delete conflicts

We have to go to some work to synthesise semi-reasonable conflict diffs.
I'm not sure they're quite perfect, but they're close enough to give the
user a hint as to what's going on.

LP: #1609972

Merged from https://code.launchpad.net/~cjwatson/turnip/+git/turnip/+merge/331347

11 of 1 result

Other repositories

You can't create new repositories for turnip.