Merge branch 'mg/merge-ff-config'
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 May 2011 23:46:23 +0000 (16:46 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 May 2011 23:46:23 +0000 (16:46 -0700)
commit36a45b4fa4cff868632162d4e3d00e1579298910
treebe0324914b3490bd4bdcabcbee287622e5fcd665
parent6c7471bcf1453d0452d4f1191edd5f0e44561a77
parent8c5cea0095ee57c36fddfb9016810c230ce26557
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
builtin/merge.c
t/t7600-merge.sh