summaryrefslogtreecommitdiff
path: root/Documentation/technical
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-26 22:07:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-06-26 22:07:43 (GMT)
commit9a17e9ad15f77b739a33da703f695ad924cd825a (patch)
treef2709ce969ea4ee0b87cad88366a69f215f731b1 /Documentation/technical
parenta036e4ebbf75e7f06fe88d8889f33b84ef5c8b4d (diff)
parent76b80cdf17807ba4a773562df2218980ffa27e4f (diff)
downloadgit-9a17e9ad15f77b739a33da703f695ad924cd825a.zip
git-9a17e9ad15f77b739a33da703f695ad924cd825a.tar.gz
git-9a17e9ad15f77b739a33da703f695ad924cd825a.tar.bz2
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 'Documentation/technical')
0 files changed, 0 insertions, 0 deletions