~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7c53fcf) | patch
Fix a merge case with files added in both heads but different
authorCatalin Marinas <catalin.marinas@gmail.com>
Thu, 7 Dec 2006 22:02:41 +0000 (22:02 +0000)
committerCatalin Marinas <catalin.marinas@gmail.com>
Thu, 7 Dec 2006 22:02:41 +0000 (22:02 +0000)
commit8d4155530f85a38980acdd6c5716e6f684c4d79f
tree00b26454ba56a165d8beb78e4e366624467b5b1etree | snapshot (tar.gz zip)
parent7c53fcf57614af48846b4684556178dadebb8f82commit | diff
Fix a merge case with files added in both heads but different

Since using git-merge-recursive instead of git-read-tree, the local
file is removed if it was added in both heads but different. We now
re-generated it in gitmergeonefile.merge. The patch also cleans the
working directory of extra files generated by git-merge-recursive
since our own merge re-generates them with nicer naming.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
stgit/git.py diff | blob | blame | history
stgit/gitmergeonefile.py diff | blob | blame | history
GIT patch-maintenance porcelain (local modifications)