path: root/git-gui/lib/merge.tcl
diff options
authorJunio C Hamano <>2008-11-02 05:31:46 (GMT)
committerJunio C Hamano <>2008-11-02 05:31:46 (GMT)
commitf6576f4c0c6fa3b2d979faf28936c09480dedaab (patch)
tree26bb4d7d46d6e67a050eaa467e88e1a251ee309a /git-gui/lib/merge.tcl
parent933bb3ae5e6c83288ec7c80c2282984f4927cb48 (diff)
parent9d83c6aa44d2ff68111865b6f72e7321e54a8972 (diff)
Merge git://
* git:// (27 commits) git-gui: Update German translation. git-gui: Do not munge conflict marker lines in a normal diff git-gui: Add a simple implementation of SSH_ASKPASS. git-gui: Add a dialog that shows the OpenSSH public key. git-gui: Mark-up strings in show_{other,unmerged}_diff() for localization git-gui: Show a round number of bytes of large untracked text files git-gui: Fix the blame viewer destroy handler. git-gui: Add a search command to the blame viewer. git-gui: Fix the blame window shape. git-gui: Fix switch statement in lib/merge.tcl git-gui: Fix fetching from remotes when adding them git-gui: Fix removing non-pushable remotes git-gui: Make input boxes in init/clone/open dialogs consistent git-gui: Avoid using the term URL when specifying repositories git-gui: gui.autoexplore makes explorer to pop up automatically after picking git-gui: Add Explore Working Copy to the Repository menu git-gui: Use git web--browser for web browsing git-gui: mkdir -p when initializing new remote repository git-gui: Add support for removing remotes git-gui: Add support for adding remotes ...
Diffstat (limited to 'git-gui/lib/merge.tcl')
1 files changed, 1 insertions, 0 deletions
diff --git a/git-gui/lib/merge.tcl b/git-gui/lib/merge.tcl
index 5c01875..283e491 100644
--- a/git-gui/lib/merge.tcl
+++ b/git-gui/lib/merge.tcl
@@ -40,6 +40,7 @@ The rescan will be automatically started now.
_O {
continue; # and pray it works!
+ _U -
U? {
error_popup [mc "You are in the middle of a conflicted merge.