![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 5 Nov 2010 18:39:07 +0000 (11:39 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 5 Nov 2010 18:39:07 +0000 (11:39 -0700) |
* ks/no-textconv-symlink:
blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664''
blame,cat-file: Demonstrate --textconv is wrongly running converter on symlinks
blame,cat-file: Prepare --textconv tests for correctly-failing conversion program
blame,cat-file --textconv: Don't assume mode is ``S_IFREF | 0664''
blame,cat-file: Demonstrate --textconv is wrongly running converter on symlinks
blame,cat-file: Prepare --textconv tests for correctly-failing conversion program
| 1 | 2 | |||
|---|---|---|---|---|
| builtin.h | patch | | diff1 | | diff2 | | blob | history |
| builtin/blame.c | patch | | diff1 | | diff2 | | blob | history |
| sha1_name.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc builtin.h
Simple merge
diff --cc builtin/blame.c
Simple merge
diff --cc sha1_name.c
Simple merge