summaryrefslogtreecommitdiff
path: root/t/t3100-ls-tree-restrict.sh
diff options
context:
space:
mode:
authorDaniel Barkalow <barkalow@iabervon.org>2005-09-25 03:50:04 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-09-25 05:05:55 (GMT)
commit7061f5c2c5fdde49a952db9dfe09bcfd8b8f9794 (patch)
tree572ada7f126f8bfad8a9fb914d2f85d4a82c6b35 /t/t3100-ls-tree-restrict.sh
parentc3bc895c81b6ec6906be7e6739edb4a50eecf6e9 (diff)
downloadgit-7061f5c2c5fdde49a952db9dfe09bcfd8b8f9794.zip
git-7061f5c2c5fdde49a952db9dfe09bcfd8b8f9794.tar.gz
git-7061f5c2c5fdde49a952db9dfe09bcfd8b8f9794.tar.bz2
[PATCH] Finish documenting trivial merge rules
Fix missing symbol explanations, a few incorrect cases, and add two-way merge rules. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t3100-ls-tree-restrict.sh')
0 files changed, 0 insertions, 0 deletions