~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3c6fbd2) | patch
Fix series mismerge
authorPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Sun, 18 Sep 2005 16:47:12 +0000 (18:47 +0200)
committerCatalin Marinas <catalin.marinas@gmail.com>
Mon, 19 Sep 2005 10:19:10 +0000 (11:19 +0100)
commit2f206b8f3d65d506f58ee9a519b4d39aca6d31d1
treef136f7c383c7edc18007703ef66814b26c90eb23tree | snapshot (tar.gz zip)
parent3c6fbd2cb3fd1d2a18585d3c13cd4517021b2f36commit | diff
Fix series mismerge

From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>

Mismerge with my addition of -e. Sorry for not pulling that time.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
stgit/commands/series.py diff | blob | blame | history
GIT patch-maintenance porcelain (local modifications)