diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-12-01 16:37:34 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-01 16:37:34 -0800 |
| commit | e760924cbeb19c6e45febdb31d9d6c95deaf2b43 (patch) | |
| tree | 4f426511d6a035ab97addf72b5fddeba7c23d3e3 /xdiff/xpatience.c | |
| parent | t0003: add missing && at end of lines (diff) | |
| parent | add: introduce add.ignoreerrors synonym for add.ignore-errors (diff) | |
| download | tgif-e760924cbeb19c6e45febdb31d9d6c95deaf2b43.tar.xz | |
Merge branch 'maint-1.7.0' into maint-1.7.1
* maint-1.7.0:
add: introduce add.ignoreerrors synonym for add.ignore-errors
Diffstat (limited to 'xdiff/xpatience.c')
0 files changed, 0 insertions, 0 deletions