Merge branch 'js/merge-edit-option'
commit3dfbe68fc29248feea3a384e156497ca2463f932
authorJunio C Hamano <gitster@pobox.com>
Wed, 19 Oct 2011 17:49:27 +0000 (19 10:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 19 Oct 2011 17:49:27 +0000 (19 10:49 -0700)
treea2681a7cd7fc4be97475709b775ee0024d45eeb5
parent9b55aa03daebf43067021b7d58abea249229987b
parent66f4b98ad9a8218ad97b7b2f1604b205072dda62
Merge branch 'js/merge-edit-option'

* js/merge-edit-option:
  Teach merge the '[-e|--edit]' option

Conflicts:
builtin/merge.c
builtin/merge.c