summaryrefslogtreecommitdiff
path: root/gitk-git
diff options
context:
space:
mode:
authorAnders Kaseorg <andersk@MIT.EDU>2011-01-19 19:45:00 (GMT)
committerPaul Mackerras <paulus@samba.org>2011-04-09 12:19:38 (GMT)
commitb74307f6a551d50e9b1aa121a326d32ff1827a93 (patch)
treed7b04a51e34481d26f9fd8418038fa539d8a0e22 /gitk-git
parent8dd60f5401c6ccfb69de5e8f76c55fa9e92edae5 (diff)
downloadgit-b74307f6a551d50e9b1aa121a326d32ff1827a93.zip
git-b74307f6a551d50e9b1aa121a326d32ff1827a93.tar.gz
git-b74307f6a551d50e9b1aa121a326d32ff1827a93.tar.bz2
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 'gitk-git')
0 files changed, 0 insertions, 0 deletions