aboutsummaryrefslogtreecommitdiffstats
path: root/git-svn.perl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-26 15:07:43 -0700
committerJunio C Hamano <gitster@pobox.com>2013-06-26 15:07:43 -0700
commit9a17e9ad15f77b739a33da703f695ad924cd825a (patch)
treef2709ce969ea4ee0b87cad88366a69f215f731b1 /git-svn.perl
parentMerge branch 'kb/diff-blob-blob-doc' (diff)
parentDocumentation/git-merge.txt: weaken warning about uncommited changes (diff)
downloadgit-9a17e9ad15f77b739a33da703f695ad924cd825a.tar.gz
git-9a17e9ad15f77b739a33da703f695ad924cd825a.zip
Merge branch 'mm/merge-in-dirty-worktree-doc'
* mm/merge-in-dirty-worktree-doc: Documentation/git-merge.txt: weaken warning about uncommited changes
Diffstat (limited to 'git-svn.perl')
0 files changed, 0 insertions, 0 deletions