diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-08-30 10:08:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-08-30 10:08:23 -0700 |
| commit | 482bd22d4985d605e7778c0e9ee21c65891f2b55 (patch) | |
| tree | 4936e140567b33abf97b8021f3877701ea33aae9 /gitk-git/Makefile | |
| parent | Merge branch 'mb/docs-favor-en-us' (diff) | |
| parent | Documentation/git-merge-file: document option "--diff3" (diff) | |
| download | tgif-482bd22d4985d605e7778c0e9ee21c65891f2b55.tar.xz | |
Merge branch 'rt/doc-merge-file-diff3'
* rt/doc-merge-file-diff3:
Documentation/git-merge-file: document option "--diff3"
Diffstat (limited to 'gitk-git/Makefile')
0 files changed, 0 insertions, 0 deletions