Andrew's git / gitweb.git / diff
?
Merge branch 'maint'
authorShawn O. Pearce <spearce@spearce.org>
Mon, 11 Jun 2007 23:06:15 +0000 (19:06 -0400)
committerShawn O. Pearce <spearce@spearce.org>
Mon, 11 Jun 2007 23:06:15 +0000 (19:06 -0400)
* maint:
git-gui: Include 'war on whitespace' fixes from git.git

1  2 
GIT-VERSION-GEN patch | diff1 | diff2 | blob | history
diff --combined GIT-VERSION-GEN
index 638de99e9e793399c61cd2ceb300447324f2532a,eee495a98666094415233a7023c03db9852dfe53..9770b0bc27ae4dfd44f4bfcfc74946fabefdc127
--- 1/GIT-VERSION-GEN
--- 2/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
  }
- 
-