| commit | 92d99c04b37e536ef01dad4f9936a67f1da710fa | |
| author | Catalin Marinas <catalin.marinas@gmail.com> | |
| Sun, 11 Jun 2006 12:05:02 +0000 (11 13:05 +0100) | ||
| committer | Catalin Marinas <catalin.marinas@gmail.com> | |
| Sun, 11 Jun 2006 12:05:02 +0000 (11 13:05 +0100) | ||
| tree | 31b965dd95217d91261e65fb568f6d84376be62a | treesnapshot (tar.gz zip) |
| parent | 5dc51fea740a2e2e2fa3d4462efe719ce0ab02b1 | commitdiff |
Fix the t1201-pull-trailing.sh test
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>
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>
| t/t1201-pull-trailing.sh | diffblobblamehistory |