From: Paolo \'Blaisorblade\' Giarrusso <blaisorblade@yahoo.it>
Date: Sun, 13 Nov 2005 19:42:25 +0000 (+0100)
Subject: Stgit - gitmergeonefile.py: handle removal vs. changes
X-Git-Tag: v0.8.1~4
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/1780280ce740fd36b032ef6fc42feb34d1dd272b?ds=sidebyside;hp=1780280ce740fd36b032ef6fc42feb34d1dd272b

Stgit - gitmergeonefile.py: handle removal vs. changes

I just got a "removal vs. changed" conflict, which is unhandled by StGit. That
is taken from git-merge-one-file resolver, but is bad, as stg resolved does not
handle unmerged entries (and probably it should be fixed too).

Sample patch included, but some thought must be done on it (see the comments I
left in).

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
---