![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 16 May 2011 23:46:23 +0000 (16:46 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 16 May 2011 23:46:23 +0000 (16:46 -0700) | ||
| commit | 36a45b4fa4cff868632162d4e3d00e1579298910 | |
| tree | be0324914b3490bd4bdcabcbee287622e5fcd665 | tree | snapshot |
| parent | 6c7471bcf1453d0452d4f1191edd5f0e44561a77 | commit | diff |
| parent | 8c5cea0095ee57c36fddfb9016810c230ce26557 | commit | diff |
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
* 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
| builtin/merge.c | diff1 | | diff2 | | blob | history |
| t/t7600-merge.sh | diff1 | | diff2 | | blob | history |