Commit message (Expand) | Author | Files | Lines | |
---|---|---|---|---|
2010-03-21 | compat: add mempcpy() | Jonathan Nieder | 1 | -0/+9 |
2010-03-21 | checkout -m --conflict=diff3: add a label for ancestor | Jonathan Nieder | 2 | -1/+2 |
2010-03-21 | merge_trees(): add ancestor label parameter for diff3-style output | Jonathan Nieder | 2 | -3/+9 |
2010-03-21 | merge_file(): add comment explaining behavior wrt conflict style | Jonathan Nieder | 1 | -0/+6 |
2010-03-21 | checkout --conflict=diff3: add a label for ancestor | Jonathan Nieder | 2 | -3/+3 |
2010-03-21 | ll_merge(): add ancestor label parameter for diff3-style output | Jonathan Nieder | 6 | -15/+17 |
2010-03-21 | merge-file --diff3: add a label for ancestor | Jonathan Nieder | 2 | -2/+3 |
2010-03-21 | xdl_merge(): move file1 and file2 labels to xmparam structure | Jonathan Nieder | 4 | -13/+20 |
2010-03-21 | xdl_merge(): add optional ancestor label to diff3-style output | Jonathan Nieder | 2 | -2/+15 |