]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 413b90f 6675ea4)
Merge git://git.kernel.org/pub/scm/gitk/gitk
authorJunio C Hamano <gitster@pobox.com>
Sun, 17 Feb 2008 01:41:38 +0000 (17:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 17 Feb 2008 01:41:38 +0000 (17:41 -0800)
* git://git.kernel.org/pub/scm/gitk/gitk:
  [PATCH] gitk: Heed the lines of context in merge commits

1  2 
gitk-git/gitk patch | diff1 | diff2 | blob | history

diff --cc gitk-git/gitk
index 25ab725bba48e62f34f8a2fab56eda82fc77be48,f1f21e97bf5e89bd7609cf5b6d1f417e35a43b6c..f1f21e97bf5e89bd7609cf5b6d1f417e35a43b6c
mode 100644,100755..100644
--- 1/gitk-git/gitk
--- 2/gitk
+++ b/gitk-git/gitk
Unnamed repository; edit this file 'description' to name the repository.