~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b975684) | patch
Print conflict details with the new infrastructure (bug #11181)
authorCatalin Marinas <catalin.marinas@gmail.com>
Wed, 3 Dec 2008 21:49:23 +0000 (21:49 +0000)
committerCatalin Marinas <catalin.marinas@gmail.com>
Wed, 3 Dec 2008 21:49:23 +0000 (21:49 +0000)
commita79cd5d5eb048bdd9e78d096f7f2cbf923d85eca
tree57accc7772b94b3a6e3d755696bd245da3308a8etree | snapshot (tar.gz zip)
parentb9756849c9297b23f0628bcb08bad9a52a8aacf8commit | diff
Print conflict details with the new infrastructure (bug #11181)

The patch modifies the IndexAndWorkTree.merge() function to display
pass the conflict information (files) when raising an exception. The
logic is similar to the one in the old infrastructure.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
Acked-by: Karl Hasselström <kha@treskal.com>
stgit/lib/git.py diff | blob | blame | history
stgit/lib/transaction.py diff | blob | blame | history
GIT patch-maintenance porcelain (local modifications)