diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-19 21:49:27 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-19 21:49:27 +0400 |
| commit | 3dfbe68fc29248feea3a384e156497ca2463f932 (patch) | |
| tree | a2681a7cd7fc4be97475709b775ee0024d45eeb5 /gpg-interface.h | |
| parent | 9b55aa03daebf43067021b7d58abea249229987b (diff) | |
| parent | 66f4b98ad9a8218ad97b7b2f1604b205072dda62 (diff) | |
Merge branch 'js/merge-edit-option'
* js/merge-edit-option:
Teach merge the '[-e|--edit]' option
Conflicts:
builtin/merge.c
Diffstat (limited to 'gpg-interface.h')
0 files changed, 0 insertions, 0 deletions