| commit | db28da31f1862c4ef324070bd041308cc26068b6 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 12 Oct 2011 21:59:32 +0000 (12 14:59 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 12 Oct 2011 21:59:32 +0000 (12 14:59 -0700) | ||
| tree | e45e79a1a8d80bf5de9c6a83416230904cdc1668 | treesnapshot (tar.gz zip) |
| parent | 819c3e46296dbc1426dcc9b174cb08f88895580e | commitdiff |
| parent | 66f4b98ad9a8218ad97b7b2f1604b205072dda62 | commitdiff |
Merge branch 'js/merge-edit-option' into next
* 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 | blobhistory |