~mdw / stgit / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f02be96) | patch
Added a test case to check what happens when push finds a conflict
authorDavid Kågedal <david@virtutech.com>
Wed, 19 Dec 2007 18:00:11 +0000 (18:00 +0000)
committerCatalin Marinas <catalin.marinas@gmail.com>
Wed, 19 Dec 2007 23:13:30 +0000 (23:13 +0000)
commit59c97ab4255eb651bc9bcc05c62bc45df3840e20
tree95802b05584d22d6659098e6ffcacbd18e567aa9tree | snapshot (tar.gz zip)
parentf02be96172f8cf36e052ff86678646b1991ed283commit | diff
Added a test case to check what happens when push finds a conflict

Signed-off-by: David Kågedal <davidk@lysator.liu.se>
Signed-off-by: Karl Hasselström <kha@treskal.com>
t/t1203-push-conflict.sh [new file with mode: 0755] blob
GIT patch-maintenance porcelain (local modifications)