summaryrefslogtreecommitdiffstats
path: root/pack.h (unfollow)
Commit message (Expand)AuthorFilesLines
2010-03-21compat: add mempcpy()Jonathan Nieder1-0/+9
2010-03-21checkout -m --conflict=diff3: add a label for ancestorJonathan Nieder2-1/+2
2010-03-21merge_trees(): add ancestor label parameter for diff3-style outputJonathan Nieder2-3/+9
2010-03-21merge_file(): add comment explaining behavior wrt conflict styleJonathan Nieder1-0/+6
2010-03-21checkout --conflict=diff3: add a label for ancestorJonathan Nieder2-3/+3
2010-03-21ll_merge(): add ancestor label parameter for diff3-style outputJonathan Nieder6-15/+17
2010-03-21merge-file --diff3: add a label for ancestorJonathan Nieder2-2/+3
2010-03-21xdl_merge(): move file1 and file2 labels to xmparam structureJonathan Nieder4-13/+20
2010-03-21xdl_merge(): add optional ancestor label to diff3-style outputJonathan Nieder2-2/+15