diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-04-03 12:28:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-04-03 12:28:41 -0700 |
| commit | 16b8a3e4b94dc7f6e05b624eae3cf1eed7b358a5 (patch) | |
| tree | d45db6fedb240fa977582ec8d76f1b340be44850 /t/t4109 | |
| parent | Merge branch 'ef/cherry-abbrev' (diff) | |
| parent | merge-recursive: add a label for ancestor (diff) | |
| download | tgif-16b8a3e4b94dc7f6e05b624eae3cf1eed7b358a5.tar.xz | |
Merge branch 'jn/merge-diff3-label'
* jn/merge-diff3-label:
merge-recursive: add a label for ancestor
cherry-pick, revert: add a label for ancestor
revert: clarify label on conflict hunks
compat: add mempcpy()
checkout -m --conflict=diff3: add a label for ancestor
merge_trees(): add ancestor label parameter for diff3-style output
merge_file(): add comment explaining behavior wrt conflict style
checkout --conflict=diff3: add a label for ancestor
ll_merge(): add ancestor label parameter for diff3-style output
merge-file --diff3: add a label for ancestor
xdl_merge(): move file1 and file2 labels to xmparam structure
xdl_merge(): add optional ancestor label to diff3-style output
tests: document cherry-pick behavior in face of conflicts
tests: document format of conflicts from checkout -m
Conflicts:
builtin/revert.c
Diffstat (limited to 't/t4109')
0 files changed, 0 insertions, 0 deletions