From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Fri, 12 Jan 2007 23:10:44 +0000 (+0000)
Subject: Track the files conflict history
X-Git-Tag: v0.12~35
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/0f4eba6a37c1a5454560b097873e5a22bfcde908?hp=0f4eba6a37c1a5454560b097873e5a22bfcde908

Track the files conflict history

This commit refreshes a pushed patch even if there was a conflict (in
which case only the correctly merged files are merged). The refresh
after fixing the conflict would log the conflict files in the patch
history.

The patch also updates the index in the case of the interactive merge.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
---