diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-04-11 13:54:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-04-11 13:54:28 -0700 |
| commit | 4553d58f374c6bfcae6b4be528bbf11c18a7efe5 (patch) | |
| tree | 44877f9283ffa304e6a805a56f2270fe21b892c7 /Documentation/git-merge.txt | |
| parent | Sync with 1.7.0.5 (diff) | |
| parent | Windows: start_command: Support non-NULL dir in struct child_process (diff) | |
| download | tgif-4553d58f374c6bfcae6b4be528bbf11c18a7efe5.tar.xz | |
Merge branch 'jl/maint-submodule-gitfile-awareness'
* jl/maint-submodule-gitfile-awareness:
Windows: start_command: Support non-NULL dir in struct child_process
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions