From: Shawn O. Pearce <spearce@spearce.org>
Date: Mon, 11 Jun 2007 23:06:15 +0000 (-0400)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.3-rc0~117^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/aa751960178af04673f88adca4988f94ffd7f2dc?ds=inline;hp=-c

Merge branch 'maint'

* maint:
git-gui: Include 'war on whitespace' fixes from git.git
---

aa751960178af04673f88adca4988f94ffd7f2dc
diff --combined GIT-VERSION-GEN
index 638de99e9e,eee495a986..9770b0bc27
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@@ -1,7 -1,7 +1,7 @@@
  #!/bin/sh
  
  GVF=GIT-VERSION-FILE
 -DEF_VER=0.7.GITGUI
 +DEF_VER=0.8.GITGUI
  
  LF='
  '
@@@ -78,5 -78,3 +78,3 @@@ test "$VN" = "$VC" || 
  	echo >&2 "GITGUI_VERSION = $VN"
  	echo "GITGUI_VERSION = $VN" >$GVF
  }
- 
-