diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-16 23:08:46 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-16 23:08:46 (GMT) |
| commit | 53756f290b94a0f8ee7021713fa63540d1a7e4e8 (patch) | |
| tree | 53ba4f90775e57fc7d0eec6d3ef2fbb4dcb7b393 /diff.h | |
| parent | af99711cd84c30a16450f73dbc21ba9f9f9803e6 (diff) | |
| parent | de6f0def506935811384a39fb0660095f5555e68 (diff) | |
| download | git-53756f290b94a0f8ee7021713fa63540d1a7e4e8.zip git-53756f290b94a0f8ee7021713fa63540d1a7e4e8.tar.gz git-53756f290b94a0f8ee7021713fa63540d1a7e4e8.tar.bz2 | |
Merge branch 'maint'
* maint:
git-merge: minor fix for no_trivial_merge_strategies.
Diffstat (limited to 'diff.h')
0 files changed, 0 insertions, 0 deletions