diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-10-19 10:49:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-19 10:49:27 -0700 |
| commit | 3dfbe68fc29248feea3a384e156497ca2463f932 (patch) | |
| tree | a2681a7cd7fc4be97475709b775ee0024d45eeb5 /alloc.c | |
| parent | Merge branch 'rs/diff-whole-function' (diff) | |
| parent | Teach merge the '[-e|--edit]' option (diff) | |
| download | tgif-3dfbe68fc29248feea3a384e156497ca2463f932.tar.xz | |
Merge branch 'js/merge-edit-option'
* js/merge-edit-option:
Teach merge the '[-e|--edit]' option
Conflicts:
builtin/merge.c
Diffstat (limited to 'alloc.c')
0 files changed, 0 insertions, 0 deletions