~mdw / stgit / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from: 92d99c0)
Fix the t1201-pull-trailing.sh test
authorCatalin Marinas <catalin.marinas@gmail.com>
Sun, 11 Jun 2006 12:05:02 +0000 (13:05 +0100)
committerCatalin Marinas <catalin.marinas@gmail.com>
Sun, 11 Jun 2006 12:05:02 +0000 (13:05 +0100)
The test was expecting a failure but StGIT actually does a three-way merge
that succeeds.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>

No differences found
GIT patch-maintenance porcelain (local modifications)