diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-02-13 23:24:02 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-02-13 23:24:02 -0800 |
commit | 42e283a1bfd0651fd2e6264157ecbe8841511788 (patch) | |
tree | d5b1e1235c93e4cad18dd37894e8cb7bd2be4adf /t/t7607-merge-overwrite.sh | |
parent | Update draft release notes to 1.7.9.1 (diff) | |
parent | merge: do not launch an editor on "--no-edit $tag" (diff) | |
download | tgif-42e283a1bfd0651fd2e6264157ecbe8841511788.tar.xz |
Merge branch 'jn/merge-no-edit-fix' into maint
* jn/merge-no-edit-fix:
merge: do not launch an editor on "--no-edit $tag"
Diffstat (limited to 't/t7607-merge-overwrite.sh')
0 files changed, 0 insertions, 0 deletions