diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-06-13 10:47:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-13 10:47:17 -0700 |
| commit | d5c48c531816102d3a86fd807fb19e661a3787d5 (patch) | |
| tree | 931ffa31daf296279e7819496c39d919ce87191d /Documentation/merge-strategies.txt | |
| parent | gitweb: Fix typo in hash key name in %opts in git_header_html (diff) | |
| parent | add-interactive: Clarify “remaining hunks in the file” (diff) | |
| download | tgif-d5c48c531816102d3a86fd807fb19e661a3787d5.tar.xz | |
Merge branch 'maint'
* maint:
add-interactive: Clarify “remaining hunks in the file”
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions