diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-03-26 10:29:05 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-03-26 10:29:05 +0300 |
commit | eed1fcd76d8893ab687c700e1729faea025ba7a8 (patch) | |
tree | f21a08093d584cf316b77c0a646a505ba1431a2d /Documentation/git-merge.txt | |
parent | f23336f5c15eb90df3275076181d10746479be5b (diff) | |
parent | a8fac795ddaa004835fc688560cf19ca5500ce8d (diff) |
Merge branch 'maint'
* maint:
documentation: update cvsimport description of "-r" for recent clone
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions