diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-11-24 15:55:36 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-24 15:55:36 -0800 |
| commit | 7d43de925b2771d295d8fc4341b7bd544e2a74fa (patch) | |
| tree | 06cd429ed1ed04337eeaf23f6d72855fd94d3c0b /git-gui/lib/tools_dlg.tcl | |
| parent | Merge branch 'ao/send-email-irt' (diff) | |
| parent | do not overwrite untracked during merge from unborn branch (diff) | |
| download | tgif-7d43de925b2771d295d8fc4341b7bd544e2a74fa.tar.xz | |
Merge branch 'cb/maint-orphan-merge-noclobber'
* cb/maint-orphan-merge-noclobber:
do not overwrite untracked during merge from unborn branch
Diffstat (limited to 'git-gui/lib/tools_dlg.tcl')
0 files changed, 0 insertions, 0 deletions