diff options
| author | Alexander Gavrilov <angavrilov@gmail.com> | 2008-11-02 21:59:47 +0300 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-11-07 22:53:17 +1100 |
| commit | 15e350552db1c0e8ede0af4f1f07dbbc9090e420 (patch) | |
| tree | 12cda3cd4a56254686ca32a511312cd22eadc59f /commit.h | |
| parent | 84a76f18f0313832ccc9c2f0171ace3da64ffa4f (diff) | |
| download | git-15e350552db1c0e8ede0af4f1f07dbbc9090e420.tar.gz | |
gitk: Make cherry-pick call git-citool on conflicts
Now that git-gui has facilities to help users resolve
conflicts, it makes sense to launch it from other GUI
tools when they happen.
Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'commit.h')
0 files changed, 0 insertions, 0 deletions