~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d568af7) | patch
Set exit code to 3 on merge conflict
authorKarl Hasselström <kha@treskal.com>
Wed, 12 Dec 2007 20:56:42 +0000 (21:56 +0100)
committerKarl Hasselström <kha@treskal.com>
Wed, 9 Jan 2008 23:37:13 +0000 (00:37 +0100)
commitf9cc5e695144b69901e3b6130361934bc062d36e
tree851c8247b737e8baf16083ae6837b59b5aeaf2f6tree | snapshot (tar.gz zip)
parentd568af721e596af12d0cde961da0030cbb43f3f0commit | diff
Set exit code to 3 on merge conflict

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