Junio C Hamano 16b8a3e4b9 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

2010-04-03 12:28:41 -07:00

..

add.c

Merge branch 'cp/add-u-pathspec'

2010-03-10 15:32:02 -08:00

annotate.c

…

apply.c

Merge branch 'bg/apply-fix-blank-at-eof'

2010-03-20 11:29:35 -07:00

archive.c

…

bisect--helper.c

…

blame.c

Merge branch 'maint'

2010-03-13 21:31:42 -08:00

branch.c

…

bundle.c

…

cat-file.c

…

check-attr.c

…

check-ref-format.c

…

checkout-index.c

…

checkout.c

checkout -m --conflict=diff3: add a label for ancestor

2010-03-20 20:36:11 -07:00

clean.c

…

clone.c

Merge branch 'tc/transport-verbosity'

2010-03-15 00:58:42 -07:00

commit-tree.c

…

commit.c

builtin/commit: remove unnecessary variable definition

2010-04-02 11:38:00 -07:00

config.c

…

count-objects.c

…

describe.c

…

diff-files.c

…

diff-index.c

…

diff-tree.c

Merge branch 'pb/log-first-parent-p-m'

2010-03-24 16:25:39 -07:00

diff.c

…

fast-export.c

Merge branch 'maint'

2010-03-28 17:42:58 -07:00

fetch-pack.c

…

fetch.c

Merge branch 'maint'

2010-03-20 11:29:19 -07:00

fmt-merge-msg.c

…

for-each-ref.c

…

fsck.c

…

gc.c

…

grep.c

Merge branch 'rs/threaded-grep-context'

2010-04-03 12:28:39 -07:00

hash-object.c

…

help.c

…

index-pack.c

…

init-db.c

Merge branch 'sd/init-template'

2010-03-10 15:32:43 -08:00

log.c

Merge branch 'ef/cherry-abbrev'

2010-04-03 12:28:40 -07:00

ls-files.c

ls: remove redundant logic

2010-03-21 16:23:44 -07:00

ls-remote.c

…

ls-tree.c

ls: remove redundant logic

2010-03-21 16:23:44 -07:00

mailinfo.c

…

mailsplit.c

Merge branch 'sh/am-keep-cr'

2010-03-10 15:32:34 -08:00

merge-base.c

…

merge-file.c

merge-file --diff3: add a label for ancestor

2010-03-20 20:36:11 -07:00

merge-index.c

…

merge-ours.c

…

merge-recursive.c

…

merge-tree.c

…

merge.c

Merge branch 'cc/cherry-pick-ff'

2010-03-28 21:52:28 -07:00

mktag.c

…

mktree.c

…

mv.c

…

name-rev.c

…

notes.c

Merge branch 'sb/notes-parse-opt'

2010-03-28 21:52:28 -07:00

pack-objects.c

…

pack-redundant.c

…

pack-refs.c

…

patch-id.c

…

prune-packed.c

…

prune.c

…

push.c

Merge branch 'tc/transport-verbosity'

2010-03-15 00:58:42 -07:00

read-tree.c

…

receive-pack.c

…

reflog.c

…

remote.c

…

replace.c

…

rerere.c

…

reset.c

Sync with 1.7.0.4

2010-03-31 15:14:27 -07:00

rev-list.c

…

rev-parse.c

…

revert.c

Merge branch 'jn/merge-diff3-label'

2010-04-03 12:28:41 -07:00

rm.c

…

send-pack.c

Merge branch 'ld/push-porcelain'

2010-03-15 00:58:24 -07:00

shortlog.c

…

show-branch.c

…

show-ref.c

…

stripspace.c

…

symbolic-ref.c

…

tag.c

…

tar-tree.c

…

unpack-file.c

…

unpack-objects.c

…

update-index.c

…

update-ref.c

…

update-server-info.c

…

upload-archive.c

…

var.c

…

verify-pack.c

…

verify-tag.c

…

write-tree.c

…