diff options
| author |  Anders Kaseorg <andersk@MIT.EDU> | 2011-01-19 14:45:00 -0500 |
|---|---|---|
| committer |  Paul Mackerras <paulus@samba.org> | 2011-04-09 22:19:38 +1000 |
| commit | b74307f6a551d50e9b1aa121a326d32ff1827a93 (patch) | |
| tree | d7b04a51e34481d26f9fd8418038fa539d8a0e22 /t/t4117-apply-reject.sh | |
| parent | gitk: Quote tag names in event bindings to avoid problems with % chars (diff) | |
| download | tgif-b74307f6a551d50e9b1aa121a326d32ff1827a93.tar.xz | |
gitk: Update cherry-pick error message parsing
Commit 981ff5c37ae20687c98d98c8689d5e89016026d2 changed the error
message from git cherry-pick from
Automatic cherry-pick failed. [...advice...]
to
error: could not apply 7ab78c9... Do something neat.
[...advice...]
Update gitk’s regex to match this, restoring the ability to launch git
citool to resolve conflicted cherry-picks.
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 't/t4117-apply-reject.sh')
0 files changed, 0 insertions, 0 deletions