diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-01-12 14:02:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-01-12 14:02:19 -0800 |
| commit | d0879b33a6c34285a870e351e8eaee5cd695e92d (patch) | |
| tree | 17df01c0a750aabdc9ec86e40921a2c37597b48b /git-merge-resolve.sh | |
| parent | efc028b1f2c6da6558094326083f7643453bfccd (diff) | |
| parent | 1d31e5a2cd9f90799330d5095783e7b972357f0e (diff) | |
| download | git-d0879b33a6c34285a870e351e8eaee5cd695e92d.tar.gz git-d0879b33a6c34285a870e351e8eaee5cd695e92d.tar.xz | |
Merge branch 'mg/add-ignore-errors' into maint
* mg/add-ignore-errors:
add: ignore only ignored files
Diffstat (limited to 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions