diff options
| author |  Daniel Barkalow <barkalow@iabervon.org> | 2005-09-24 23:50:04 -0400 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2005-09-24 22:05:55 -0700 |
| commit | 7061f5c2c5fdde49a952db9dfe09bcfd8b8f9794 (patch) | |
| tree | 572ada7f126f8bfad8a9fb914d2f85d4a82c6b35 /cat-file.c | |
| parent | Remove use of 'xargs -0' from git-reset. (diff) | |
| download | tgif-7061f5c2c5fdde49a952db9dfe09bcfd8b8f9794.tar.xz | |
[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 'cat-file.c')
0 files changed, 0 insertions, 0 deletions