~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a622d90) | patch
Deal with merge conflicts directly
authorCatalin Marinas <catalin.marinas@gmail.com>
Fri, 10 Mar 2006 21:44:44 +0000 (21:44 +0000)
committerCatalin Marinas <catalin.marinas@gmail.com>
Fri, 10 Mar 2006 21:45:32 +0000 (21:45 +0000)
commit3659ef88d90c0c76acb34c448fb8f61087ff25b8
treee7255abd65560458655acd519adf3680a2b09743tree | snapshot (tar.gz zip)
parenta622d90bbeccf29319dc2c3142a93ae1010648fecommit | diff
Deal with merge conflicts directly

This patch removes the need of calling the external git-merge-index and
gitmergeonefile.py. These are replaced by internal solving of the unmerged
stages in the index file.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
gitmergeonefile.py [deleted file] blob | blame | history
setup.py diff | blob | blame | history
stgit/git.py diff | blob | blame | history
stgit/gitmergeonefile.py [new file with mode: 0644] blob
stgit/main.py diff | blob | blame | history
GIT patch-maintenance porcelain (local modifications)