git · GunioRobot · Oct 21, 2011
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
@@ -174,13 +174,13 @@ index 65898fa..b002dc6 100644
 --- a/init-db.c
 +++ b/init-db.c
 @@ -7,7 +7,7 @@
- 
+
  int main(int argc, char **argv)
  {
 -	char *sha1_dir = getenv(DB_ENVIRONMENT), *path;
 +	char *sha1_dir, *path;
  	int len, i;
- 
+
  	if (mkdir(".git", 0755) < 0) {
 ------------------------------------------------
 

diff --git a/compat/regex/regcomp.c b/compat/regex/regcomp.c
@@ -208,7 +208,7 @@ const size_t __re_error_msgid_idx[] attribute_hidden =
 
 /* For ZOS USS we must define btowc */
 
-wchar_t 
+wchar_t
 btowc (int c)
 {
    wchar_t wtmp[2];

diff --git a/git-gui/lib/diff.tcl b/git-gui/lib/diff.tcl
@@ -42,7 +42,7 @@ proc reshow_diff {{after {}}} {
 
 proc force_diff_encoding {enc} {
 	global current_diff_path
-	
+
 	if {$current_diff_path ne {}} {
 		force_path_encoding $current_diff_path $enc
 		reshow_diff

diff --git a/git-gui/lib/mergetool.tcl b/git-gui/lib/mergetool.tcl
@@ -110,7 +110,7 @@ proc read_merge_stages {fd cont} {
 		set fcols [split $p "\t"]
 		set cols  [split [lindex $fcols 0] " "]
 		set stage [lindex $cols 2]
-		
+
 		set merge_stages($stage) [lrange $cols 0 1]
 	}
 

diff --git a/git-gui/lib/search.tcl b/git-gui/lib/search.tcl
@@ -37,7 +37,7 @@ constructor new {i_w i_text args} {
 	trace add variable searchstring write [cb _incrsearch_cb]
 	bind $w.ent <Return> [cb find_next]
 	bind $w.ent <Shift-Return> [cb find_prev]
-	
+
 	bind $w <Destroy> [list delete_this $this]
 	return $this
 }

diff --git a/t/lib-diff-alternative.sh b/t/lib-diff-alternative.sh
@@ -65,7 +65,7 @@ index 6faa5a3..e3af329 100644
 +++ b/file2
 @@ -1,26 +1,25 @@
  #include <stdio.h>
- 
+
 +int fib(int n)
 +{
 +    if(n > 2)
@@ -85,7 +85,7 @@ index 6faa5a3..e3af329 100644
          printf("%d\n", foo);
      }
  }
- 
+
 -int fact(int n)
 -{
 -    if(n > 1)

diff --git a/t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..master^ b/t/t4013/diff.format-patch_--stdout_--cover-letter_-n_initial..master^
@@ -18,7 +18,7 @@ A U Thor (2):
  create mode 100644 file1
  delete mode 100644 file2
 
--- 
+--
 g-i-t--v-e-r-s-i-o-n
 
 From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001
@@ -63,7 +63,7 @@ index 01e79c3..0000000
 -1
 -2
 -3
--- 
+--
 g-i-t--v-e-r-s-i-o-n
 
 
@@ -97,7 +97,7 @@ index 0000000..b1e6722
 +A
 +B
 +C
--- 
+--
 g-i-t--v-e-r-s-i-o-n
 
 $
diff --git a/t/t4013/diff.format-patch_--stdout_--no-numbered_initial..master b/t/t4013/diff.format-patch_--stdout_--no-numbered_initial..master
@@ -41,7 +41,7 @@ index 01e79c3..0000000
 -1
 -2
 -3
--- 
+--
 g-i-t--v-e-r-s-i-o-n
 
 
@@ -75,7 +75,7 @@ index 0000000..b1e6722
 +A
 +B
 +C
--- 
+--
 g-i-t--v-e-r-s-i-o-n
 
 
@@ -121,7 +121,7 @@ index 0000000..7289e35
 +B
 +1
 +2
--- 
+--
 g-i-t--v-e-r-s-i-o-n
 
 $
diff --git a/t/t4013/diff.format-patch_--stdout_--numbered_initial..master b/t/t4013/diff.format-patch_--stdout_--numbered_initial..master
@@ -41,7 +41,7 @@ index 01e79c3..0000000
 -1
 -2
 -3
--- 
+--
 g-i-t--v-e-r-s-i-o-n
 
 
@@ -75,7 +75,7 @@ index 0000000..b1e6722
 +A
 +B
 +C
--- 
+--
 g-i-t--v-e-r-s-i-o-n
 
 
@@ -121,7 +121,7 @@ index 0000000..7289e35
 +B
 +1
 +2
--- 
+--
 g-i-t--v-e-r-s-i-o-n
 
 $
diff --git a/t/t4013/diff.format-patch_--stdout_initial..master b/t/t4013/diff.format-patch_--stdout_initial..master
@@ -41,7 +41,7 @@ index 01e79c3..0000000
 -1
 -2
 -3
--- 
+--
 g-i-t--v-e-r-s-i-o-n
 
 
@@ -75,7 +75,7 @@ index 0000000..b1e6722
 +A
 +B
 +C
--- 
+--
 g-i-t--v-e-r-s-i-o-n
 
 
@@ -121,7 +121,7 @@ index 0000000..7289e35
 +B
 +1
 +2
--- 
+--
 g-i-t--v-e-r-s-i-o-n
 
 $
diff --git a/t/t4013/diff.format-patch_--stdout_initial..master^ b/t/t4013/diff.format-patch_--stdout_initial..master^
@@ -41,7 +41,7 @@ index 01e79c3..0000000
 -1
 -2
 -3
--- 
+--
 g-i-t--v-e-r-s-i-o-n
 
 
@@ -75,7 +75,7 @@ index 0000000..b1e6722
 +A
 +B
 +C
--- 
+--
 g-i-t--v-e-r-s-i-o-n
 
 $
diff --git a/t/t4013/diff.format-patch_--stdout_initial..side b/t/t4013/diff.format-patch_--stdout_initial..side
@@ -41,7 +41,7 @@ index 0000000..7289e35
 +B
 +1
 +2
--- 
+--
 g-i-t--v-e-r-s-i-o-n
 
 $
diff --git a/t/t4013/diff.log_--decorate=full_--all b/t/t4013/diff.log_--decorate=full_--all
@@ -29,7 +29,7 @@ Author: A U Thor <[email protected]>
 Date:   Mon Jun 26 00:01:00 2006 +0000
 
     Second
-    
+
     This is the second commit.
 
 commit 444ac553ac7612cc88969031b02b3767fb8a353a (refs/heads/initial)

diff --git a/t/t4013/diff.log_--decorate_--all b/t/t4013/diff.log_--decorate_--all
@@ -29,7 +29,7 @@ Author: A U Thor <[email protected]>
 Date:   Mon Jun 26 00:01:00 2006 +0000
 
     Second
-    
+
     This is the second commit.
 
 commit 444ac553ac7612cc88969031b02b3767fb8a353a (initial)

diff --git a/t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_ b/t/t4013/diff.log_--patch-with-stat_--summary_master_--_dir_
@@ -50,7 +50,7 @@ Author: A U Thor <[email protected]>
 Date:   Mon Jun 26 00:01:00 2006 +0000
 
     Second
-    
+
     This is the second commit.
 ---
  dir/sub |    2 ++

diff --git a/t/t4013/diff.log_--patch-with-stat_master b/t/t4013/diff.log_--patch-with-stat_master
@@ -83,7 +83,7 @@ Author: A U Thor <[email protected]>
 Date:   Mon Jun 26 00:01:00 2006 +0000
 
     Second
-    
+
     This is the second commit.
 ---
  dir/sub |    2 ++

diff --git a/t/t4013/diff.log_--patch-with-stat_master_--_dir_ b/t/t4013/diff.log_--patch-with-stat_master_--_dir_
@@ -50,7 +50,7 @@ Author: A U Thor <[email protected]>
 Date:   Mon Jun 26 00:01:00 2006 +0000
 
     Second
-    
+
     This is the second commit.
 ---
  dir/sub |    2 ++

diff --git a/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master b/t/t4013/diff.log_--root_--cc_--patch-with-stat_--summary_master
@@ -117,7 +117,7 @@ Author: A U Thor <[email protected]>
 Date:   Mon Jun 26 00:01:00 2006 +0000
 
     Second
-    
+
     This is the second commit.
 ---
  dir/sub |    2 ++

diff --git a/t/t4013/diff.log_--root_--patch-with-stat_--summary_master b/t/t4013/diff.log_--root_--patch-with-stat_--summary_master
@@ -85,7 +85,7 @@ Author: A U Thor <[email protected]>
 Date:   Mon Jun 26 00:01:00 2006 +0000
 
     Second
-    
+
     This is the second commit.
 ---
  dir/sub |    2 ++

diff --git a/t/t4013/diff.log_--root_--patch-with-stat_master b/t/t4013/diff.log_--root_--patch-with-stat_master
@@ -83,7 +83,7 @@ Author: A U Thor <[email protected]>
 Date:   Mon Jun 26 00:01:00 2006 +0000
 
     Second
-    
+
     This is the second commit.
 ---
  dir/sub |    2 ++

diff --git a/t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master b/t/t4013/diff.log_--root_-c_--patch-with-stat_--summary_master
@@ -117,7 +117,7 @@ Author: A U Thor <[email protected]>
 Date:   Mon Jun 26 00:01:00 2006 +0000
 
     Second
-    
+
     This is the second commit.
 ---
  dir/sub |    2 ++

diff --git a/t/t4013/diff.log_--root_-p_master b/t/t4013/diff.log_--root_-p_master
@@ -74,7 +74,7 @@ Author: A U Thor <[email protected]>
 Date:   Mon Jun 26 00:01:00 2006 +0000
 
     Second
-    
+
     This is the second commit.
 
 diff --git a/dir/sub b/dir/sub

diff --git a/t/t4013/diff.log_--root_master b/t/t4013/diff.log_--root_master
@@ -23,7 +23,7 @@ Author: A U Thor <[email protected]>
 Date:   Mon Jun 26 00:01:00 2006 +0000
 
     Second
-    
+
     This is the second commit.
 
 commit 444ac553ac7612cc88969031b02b3767fb8a353a

diff --git a/t/t4013/diff.log_-m_-p_--first-parent_master b/t/t4013/diff.log_-m_-p_--first-parent_master
@@ -59,7 +59,7 @@ Author: A U Thor <[email protected]>
 Date:   Mon Jun 26 00:01:00 2006 +0000
 
     Second
-    
+
     This is the second commit.
 
 diff --git a/dir/sub b/dir/sub

diff --git a/t/t4013/diff.log_-m_-p_master b/t/t4013/diff.log_-m_-p_master
@@ -159,7 +159,7 @@ Author: A U Thor <[email protected]>
 Date:   Mon Jun 26 00:01:00 2006 +0000
 
     Second
-    
+
     This is the second commit.
 
 diff --git a/dir/sub b/dir/sub

diff --git a/t/t4013/diff.log_-p_--first-parent_master b/t/t4013/diff.log_-p_--first-parent_master
@@ -37,7 +37,7 @@ Author: A U Thor <[email protected]>
 Date:   Mon Jun 26 00:01:00 2006 +0000
 
     Second
-    
+
     This is the second commit.
 
 diff --git a/dir/sub b/dir/sub

diff --git a/t/t4013/diff.log_-p_master b/t/t4013/diff.log_-p_master
@@ -74,7 +74,7 @@ Author: A U Thor <[email protected]>
 Date:   Mon Jun 26 00:01:00 2006 +0000
 
     Second
-    
+
     This is the second commit.
 
 diff --git a/dir/sub b/dir/sub

diff --git a/t/t4013/diff.log_master b/t/t4013/diff.log_master
@@ -23,7 +23,7 @@ Author: A U Thor <[email protected]>
 Date:   Mon Jun 26 00:01:00 2006 +0000
 
     Second
-    
+
     This is the second commit.
 
 commit 444ac553ac7612cc88969031b02b3767fb8a353a

diff --git a/t/t4013/diff.whatchanged_--patch-with-stat_--summary_master_--_dir_ b/t/t4013/diff.whatchanged_--patch-with-stat_--summary_master_--_dir_
@@ -43,7 +43,7 @@ Author: A U Thor <[email protected]>
 Date:   Mon Jun 26 00:01:00 2006 +0000
 
     Second
-    
+
     This is the second commit.
 ---
  dir/sub |    2 ++

diff --git a/t/t4013/diff.whatchanged_--patch-with-stat_master b/t/t4013/diff.whatchanged_--patch-with-stat_master
@@ -76,7 +76,7 @@ Author: A U Thor <[email protected]>
 Date:   Mon Jun 26 00:01:00 2006 +0000
 
     Second
-    
+
     This is the second commit.
 ---
  dir/sub |    2 ++

diff --git a/t/t4013/diff.whatchanged_--patch-with-stat_master_--_dir_ b/t/t4013/diff.whatchanged_--patch-with-stat_master_--_dir_
@@ -43,7 +43,7 @@ Author: A U Thor <[email protected]>
 Date:   Mon Jun 26 00:01:00 2006 +0000
 
     Second
-    
+
     This is the second commit.
 ---
  dir/sub |    2 ++

diff --git a/t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master b/t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master
@@ -117,7 +117,7 @@ Author: A U Thor <[email protected]>
 Date:   Mon Jun 26 00:01:00 2006 +0000
 
     Second
-    
+
     This is the second commit.
 ---
  dir/sub |    2 ++

diff --git a/t/t4013/diff.whatchanged_--root_--patch-with-stat_--summary_master b/t/t4013/diff.whatchanged_--root_--patch-with-stat_--summary_master
@@ -78,7 +78,7 @@ Author: A U Thor <[email protected]>
 Date:   Mon Jun 26 00:01:00 2006 +0000
 
     Second
-    
+
     This is the second commit.
 ---
  dir/sub |    2 ++
-Original file line number
+Diff line change
@@ Expand Up / @@ -208,7 +208,7 @@ const size_t __re_error_msgid_idx[] attribute_hidden = @@
     /* For ZOS USS we must define btowc */
-    wchar_t
+    wchar_t
     btowc (int c)
     {
        wchar_t wtmp[2];
@@ Expand Down @@