diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-06-16 17:39:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-06-16 17:39:50 -0700 |
| commit | 5f54de5bd07481f6d88e8dbd5551f3356ecbf513 (patch) | |
| tree | c7e18035bebac574a1c44a38ef4fa9daf7fe0ddc /Documentation/git-merge-one-file.txt | |
| parent | Merge branch 'maint' (diff) | |
| parent | diff.c: fix emit_line() again not to add extra line (diff) | |
| download | tgif-5f54de5bd07481f6d88e8dbd5551f3356ecbf513.tar.xz | |
Merge branch 'maint'
* maint:
diff.c: fix emit_line() again not to add extra line
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions