Code

Merge branch 'jn/merge-no-edit-fix'
authorJunio C Hamano <gitster@pobox.com>
Mon, 13 Feb 2012 06:41:51 +0000 (22:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 Feb 2012 06:41:51 +0000 (22:41 -0800)
commit5cdc9fbb0894023da8e4dab552dfdda8b662feab
tree9c4c577d565a76e2af67903d4cf0e98a3d416c14
parentb6b3b6a01f357922ccd14f2615accc9bd39fc194
parent3adab6f3a7793253b22a4a7aae34221d19e0236a
Merge branch 'jn/merge-no-edit-fix'

* jn/merge-no-edit-fix:
  merge: do not launch an editor on "--no-edit $tag"

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