![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 19 Oct 2011 17:49:27 +0000 (10:49 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 19 Oct 2011 17:49:27 +0000 (10:49 -0700) | ||
| commit | 3dfbe68fc29248feea3a384e156497ca2463f932 | |
| tree | a2681a7cd7fc4be97475709b775ee0024d45eeb5 | tree | snapshot |
| parent | 9b55aa03daebf43067021b7d58abea249229987b | commit | diff |
| parent | 66f4b98ad9a8218ad97b7b2f1604b205072dda62 | commit | diff |
Merge branch 'js/merge-edit-option'
* js/merge-edit-option:
Teach merge the '[-e|--edit]' option
Conflicts:
builtin/merge.c
* js/merge-edit-option:
Teach merge the '[-e|--edit]' option
Conflicts:
builtin/merge.c
| builtin/merge.c | diff1 | | diff2 | | blob | history |