diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-05-03 14:08:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-05-03 14:08:17 -0700 |
| commit | b97414352746967c72e5b87cce39efea4b93e2bf (patch) | |
| tree | 2737978df20165cd0149efde1ed35cca7e2611e8 /Documentation/git-merge-one-file.txt | |
| parent | Merge branch 'jd/send-email-to-whom' (diff) | |
| parent | difftool/mergetool: make the form of yes/no questions consistent (diff) | |
| download | tgif-b97414352746967c72e5b87cce39efea4b93e2bf.tar.xz | |
Merge branch 'nf/mergetool-prompt'
UI consistency improvements.
* nf/mergetool-prompt:
difftool/mergetool: make the form of yes/no questions consistent
Diffstat (limited to 'Documentation/git-merge-one-file.txt')
0 files changed, 0 insertions, 0 deletions