diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-05-16 16:46:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-16 16:46:23 -0700 |
| commit | 36a45b4fa4cff868632162d4e3d00e1579298910 (patch) | |
| tree | be0324914b3490bd4bdcabcbee287622e5fcd665 /compat | |
| parent | Merge branch 'maint' (diff) | |
| parent | tests: check git does not barf on merge.ff values for future versions of git (diff) | |
| download | tgif-36a45b4fa4cff868632162d4e3d00e1579298910.tar.xz | |
Merge branch 'mg/merge-ff-config'
* mg/merge-ff-config:
tests: check git does not barf on merge.ff values for future versions of git
merge: introduce merge.ff configuration variable
Conflicts:
t/t7600-merge.sh
Diffstat (limited to 'compat')
0 files changed, 0 insertions, 0 deletions