| commit | 15e350552db1c0e8ede0af4f1f07dbbc9090e420 | |
| author | Alexander Gavrilov <angavrilov@gmail.com> | |
| Sun, 2 Nov 2008 18:59:47 +0000 (2 21:59 +0300) | ||
| committer | Paul Mackerras <paulus@samba.org> | |
| Fri, 7 Nov 2008 11:53:17 +0000 (7 22:53 +1100) | ||
| tree | 12cda3cd4a56254686ca32a511312cd22eadc59f | treesnapshot (tar.gz zip) |
| parent | 84a76f18f0313832ccc9c2f0171ace3da64ffa4f | commitdiff |
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>
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>
| gitk | diffblobblamehistory |