![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 18 Jun 2010 18:16:57 +0000 (11:16 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 18 Jun 2010 18:16:57 +0000 (11:16 -0700) | ||
| commit | 5977744d045cacb809a3e3630dbbd28fe83976ae | |
| tree | 276ab50231e80bf913148e421247a5a4ecf78653 | tree | snapshot |
| parent | 98ad90fbab90a423ca835956d3121c60db2eb218 | commit | diff |
| parent | 296c6bb21a6980f6e5b42f0790d6365c1e3f696f | commit | diff |
Merge branch 'cc/maint-diff-CC-binary'
* cc/maint-diff-CC-binary:
diff: fix "git show -C -C" output when renaming a binary file
Conflicts:
diff.c
* cc/maint-diff-CC-binary:
diff: fix "git show -C -C" output when renaming a binary file
Conflicts:
diff.c
| diff.c | diff1 | | diff2 | | blob | history |
| t/t4015-diff-whitespace.sh | diff1 | | diff2 | | blob | history |