chiark / gitweb /
~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0fbf980) | patch
We keep the different stages of a conflict in the index now
authorKarl Hasselström <kha@treskal.com>
Wed, 19 Dec 2007 18:00:13 +0000 (18:00 +0000)
committerCatalin Marinas <catalin.marinas@gmail.com>
Wed, 19 Dec 2007 23:13:31 +0000 (23:13 +0000)
commit785552feb825d6ff07c20f981ad00991f13f471e
treea86f6004f79d6a63071c745b33e8cca1bb888ccbtree | snapshot
parent0fbf98010616f6c12312b8153dd34c462565a74dcommit | diff
We keep the different stages of a conflict in the index now

Signed-off-by: Karl Hasselström <kha@treskal.com>
stgit/commands/resolved.py diff | blob | blame | history
GIT patch-maintenance porcelain (local modifications)