]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9b55aa0 66f4b98)
Merge branch 'js/merge-edit-option'
authorJunio C Hamano <gitster@pobox.com>
Wed, 19 Oct 2011 17:49:27 +0000 (10:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 19 Oct 2011 17:49:27 +0000 (10:49 -0700)
commit3dfbe68fc29248feea3a384e156497ca2463f932
treea2681a7cd7fc4be97475709b775ee0024d45eeb5tree | snapshot
parent9b55aa03daebf43067021b7d58abea249229987bcommit | diff
parent66f4b98ad9a8218ad97b7b2f1604b205072dda62commit | diff
Merge branch 'js/merge-edit-option'

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

Conflicts:
builtin/merge.c
builtin/merge.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.