| commit | d07f651c25ce3980e9519872f772af12a12c8d26 | |
| author | Junio C Hamano <junkio@cox.net> | |
| Sat, 16 Apr 2005 02:20:42 +0000 (15 19:20 -0700) | ||
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Sat, 16 Apr 2005 02:20:42 +0000 (15 19:20 -0700) | ||
| tree | 420f7beb8c3b0e8b7a5e6e8dad92e1246e1dcfb3 | treesnapshot (tar.gz zip) |
| parent | 6cbd72f8d5d794112eab68f7e7222c9a0c5d6587 | commitdiff |
[PATCH] Add '-z' to merge-tree.c
This adds '-z' to merge-tree and changes its default line termination to
LF to make it consistent with your other recent changes.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This adds '-z' to merge-tree and changes its default line termination to
LF to make it consistent with your other recent changes.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| merge-tree.c | diffblobblamehistory |