Merge branch 'jc/better-conflict-resolution'
authorShawn O. Pearce <spearce@spearce.org>
Mon, 29 Sep 2008 17:04:21 +0000 (10:04 -0700)
committerShawn O. Pearce <spearce@spearce.org>
Mon, 29 Sep 2008 17:15:07 +0000 (10:15 -0700)
commit9ba929ed652f5ed7707f1c684999af4ad02c4925
tree434d9a7552de1c2dffaf723120fc90d83aa52743
parentc11c7a5db3676258512c4067c5279377811d3ab8
parent3407a7a9e67b165902be85b0807e9ea789b3c67d
Merge branch 'jc/better-conflict-resolution'

* jc/better-conflict-resolution:
  Fix AsciiDoc errors in merge documentation
  git-merge documentation: describe how conflict is presented
  checkout --conflict=<style>: recreate merge in a non-default style
  checkout -m: recreate merge when checking out of unmerged index
  git-merge-recursive: learn to honor merge.conflictstyle
  merge.conflictstyle: choose between "merge" and "diff3 -m" styles
  rerere: understand "diff3 -m" style conflicts with the original
  rerere.c: use symbolic constants to keep track of parsing states
  xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less
  xmerge.c: minimum readability fixups
  xdiff-merge: optionally show conflicts in "diff3 -m" style
  xdl_fill_merge_buffer(): separate out a too deeply nested function
  checkout --ours/--theirs: allow checking out one side of a conflicting merge
  checkout -f: allow ignoring unmerged paths when checking out of the index

Conflicts:
Documentation/git-checkout.txt
builtin-checkout.c
builtin-merge-recursive.c
t/t7201-co.sh
Documentation/config.txt
Documentation/git-checkout.txt
Documentation/git-merge.txt
builtin-checkout.c
rerere.c
t/t6023-merge-file.sh
t/t7201-co.sh
xdiff-interface.c
xdiff-interface.h