diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-11-15 16:38:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-15 16:38:47 -0800 |
| commit | dd2195eb80ee5753e41d9688ddf6758a142a14df (patch) | |
| tree | b0417d1e3110a601b958dcbedd2e9a8eb33fe5b2 /builtin-merge-file.c | |
| parent | Merge branch 'tr/maint-roff-quote' into maint (diff) | |
| parent | info/grafts: allow trailing whitespaces at the end of line (diff) | |
| download | tgif-dd2195eb80ee5753e41d9688ddf6758a142a14df.tar.xz | |
Merge branch 'jc/maint-1.6.3-graft-trailing-space' into maint
* jc/maint-1.6.3-graft-trailing-space:
info/grafts: allow trailing whitespaces at the end of line
Diffstat (limited to 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions