X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/f7ed76a9b6158888e8efe2faef9c095802fd93fe..0f4eba6a37c1a5454560b097873e5a22bfcde908:/stgit/gitmergeonefile.py

diff --git a/stgit/gitmergeonefile.py b/stgit/gitmergeonefile.py
index 200448b..587c8c4 100644
--- a/stgit/gitmergeonefile.py
+++ b/stgit/gitmergeonefile.py
@@ -199,6 +199,7 @@ def merge(orig_hash, file1_hash, file2_hash,
                             __conflict(path)
                             return 1
                         # successful interactive merge
+                        os.system('git-update-index -- %s' % path)
                         __remove_files(orig_hash, file1_hash, file2_hash)
                         return 0
                     else: