diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-30 14:45:08 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-30 14:45:08 -0800 |
| commit | 045c05048530b8c57c410886e5f64d91a44c2c83 (patch) | |
| tree | ab68728e79a4e97bb16fe0bedbf9468daeaed585 /t | |
| parent | 22c4e72d6eef8295a3311f6eb2f82a5494f8b88e (diff) | |
| parent | e2ced7de19c85f3b246480bfacdcc934c98c08ca (diff) | |
| download | git-045c05048530b8c57c410886e5f64d91a44c2c83.tar.gz git-045c05048530b8c57c410886e5f64d91a44c2c83.tar.xz | |
Merge branch 'mm/maint-merge-ff-error-message-fix'
Conflicts:
merge-recursive.c
Diffstat (limited to 't')
0 files changed, 0 insertions, 0 deletions