diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-02-12 22:41:51 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-02-12 22:41:51 -0800 |
| commit | 5cdc9fbb0894023da8e4dab552dfdda8b662feab (patch) | |
| tree | 9c4c577d565a76e2af67903d4cf0e98a3d416c14 /builtin/check-attr.c | |
| parent | Update draft release notes to 1.7.10 (diff) | |
| parent | merge: do not launch an editor on "--no-edit $tag" (diff) | |
| download | tgif-5cdc9fbb0894023da8e4dab552dfdda8b662feab.tar.xz | |
Merge branch 'jn/merge-no-edit-fix'
* jn/merge-no-edit-fix:
merge: do not launch an editor on "--no-edit $tag"
Conflicts:
builtin/merge.c
Diffstat (limited to 'builtin/check-attr.c')
0 files changed, 0 insertions, 0 deletions