@matheusbsbs / matheus-bagliano / commits / 3dfbe68fc2

Merge branch 'js/merge-edit-option'

* js/merge-edit-option: Teach merge the '[-e|--edit]' option Conflicts: builtin/merge.c

Junio C Hamano committed Oct 19, 2011 at 10:49 UTC 3dfbe68fc29248feea3a384e156497ca2463f932

No changes.