From 7c2ca986515e2009ab29080e57ae8b38c921ba4d Mon Sep 17 00:00:00 2001 From: Steffen Prohaska Date: Sat, 16 Aug 2008 16:11:28 +0200 Subject: [PATCH] gitk: Fix wrong merge This fixes the wrong conflict resolution of merge 5673e9999d7e120f4b68c2c5a61c5ec48ec38cad --- gitk-git/gitk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitk-git/gitk b/gitk-git/gitk index c6b06df56b..9636d15115 100644 --- a/gitk-git/gitk +++ b/gitk-git/gitk @@ -9993,4 +9993,4 @@ if {[info exists permviews]} { } } focus -force . -getcommits +getcommits {}