chiark / gitweb /
~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a008f84) | patch
Fix "stg resolved" to work with new conflict representation
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:30 +0000 (23:13 +0000)
commitc5bd76328bafd7cd95f826342c0741c2ad64a545
tree87eb6ae587d5cdb0955da4a3d9e0119d4fef21betree | snapshot
parenta008f844a95a45267933e23c6cda31f430b70ba6commit | diff
Fix "stg resolved" to work with new conflict representation

The actual resolving is done by calling the same subroutine as "git
add".

Instead of using existing *.{ancestor,current,patches} files, the
interactive merge has to create them from the index contents, and
delete them afterwards.

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