From: Karl Hasselström Date: Wed, 19 Dec 2007 18:00:13 +0000 (+0000) Subject: We keep the different stages of a conflict in the index now X-Git-Tag: v0.15-rc1~331 X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/commitdiff_plain/785552feb825d6ff07c20f981ad00991f13f471e?ds=sidebyside;hp=785552feb825d6ff07c20f981ad00991f13f471e We keep the different stages of a conflict in the index now Signed-off-by: Karl Hasselström ---