diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-10-30 21:32:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-10-30 21:34:36 -0700 |
| commit | 0bdb5af7a571ee2bd71550a545632b1cb7f8f8f3 (patch) | |
| tree | 636710e3a31311a139ad254eb2a263ef8a989fdc /Documentation/merge-options.txt | |
| parent | git-rebase--interactive.sh: Make 3-way merge strategies work for -p. (diff) | |
| download | tgif-0bdb5af7a571ee2bd71550a545632b1cb7f8f8f3.tar.xz | |
Update GIT 1.5.3.5 Release Notes
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-options.txt')
0 files changed, 0 insertions, 0 deletions