~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 350bcba) | patch
Use the output from merge-recursive to list conflicts
authorDavid Kågedal <david@virtutech.com>
Wed, 19 Dec 2007 18:00:12 +0000 (18:00 +0000)
committerCatalin Marinas <catalin.marinas@gmail.com>
Wed, 19 Dec 2007 23:13:30 +0000 (23:13 +0000)
commit6c76a03347dca249ac12f791d6321ff15889c64a
treec3a30bf00c1c0e302ee2c07811eefba7f16e1562tree | snapshot (tar.gz zip)
parent350bcba5aeae79c9e8e6619d2b00ec1804c1390fcommit | diff
Use the output from merge-recursive to list conflicts

merge-recursive already has useful information about what the conflicts
were, so we reuse that when pushing.

Signed-off-by: David Kågedal <davidk@lysator.liu.se>
Signed-off-by: Karl Hasselström <kha@treskal.com>
stgit/git.py diff | blob | blame | history
stgit/stack.py diff | blob | blame | history
GIT patch-maintenance porcelain (local modifications)