From 88f5c8b4175749476df985a83ca94af87e0fa054 Mon Sep 17 00:00:00 2001
From: Gaetan Semet <gaetan@xeberon.net>
Date: Wed, 28 Jan 2015 15:58:53 +0100
Subject: [PATCH] update bb script

Signed-off-by: Gaetan Semet <gaetan@xeberon.net>
---
 custom/plugins/buildbot_dev/buildbot_dev.plugin.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/custom/plugins/buildbot_dev/buildbot_dev.plugin.zsh b/custom/plugins/buildbot_dev/buildbot_dev.plugin.zsh
index af034ca0f..c2c215ef7 100644
--- a/custom/plugins/buildbot_dev/buildbot_dev.plugin.zsh
+++ b/custom/plugins/buildbot_dev/buildbot_dev.plugin.zsh
@@ -112,8 +112,9 @@ function bb_merge_bottom_branch_to_here()
     eval $cmd
     git mergetool --no-prompt
     if [[ $? == 0 ]]; then
-        git gui
+        git gui citool
     fi
+    echo "Use 'bb_push_with_care' to push your merge to Gerrit"
 }