diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-03-16 16:47:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-16 16:47:25 -0700 |
| commit | bd2700dbdf6551c646bc4d68b6230b63ca6eaea3 (patch) | |
| tree | 3508a48d15872c36dcd7f8f864c4f5cecd00b5f9 /builtin/merge.c | |
| parent | 5b8aac32fbf5be49e2cdfbdb082fa6bca9548d24 (diff) | |
| parent | 2485eab55cc0dcab34311ecd0ac52038aa9d9db4 (diff) | |
| download | git-bd2700dbdf6551c646bc4d68b6230b63ca6eaea3.tar.gz git-bd2700dbdf6551c646bc4d68b6230b63ca6eaea3.tar.xz | |
Merge branch 'mg/patch-id' into maint
* mg/patch-id:
git-patch-id: do not trip over "no newline" markers
git-patch-id: test for "no newline" markers
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions