diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-06-21 05:40:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-21 05:40:10 -0700 |
| commit | cb2af93ac183c1a6d5635bb2be047c1ade362099 (patch) | |
| tree | 873eccd7b908c65f55a78c6f0685f9bc90601fd1 /merge-file.c | |
| parent | Merge branch 'cb/assume-unchanged-fix' into maint (diff) | |
| parent | diff: fix coloring of extended diff headers (diff) | |
| download | tgif-cb2af93ac183c1a6d5635bb2be047c1ade362099.tar.xz | |
Merge branch 'bw/diff-metainfo-color' into maint
* bw/diff-metainfo-color:
diff: fix coloring of extended diff headers
Diffstat (limited to 'merge-file.c')
0 files changed, 0 insertions, 0 deletions