chiark / gitweb /
~mdw / stgit / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from: 3659ef8)
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)
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>

No differences found
GIT patch-maintenance porcelain (local modifications)