diff options
author | Shawn O. Pearce <spearce@spearce.org> | 2008-09-29 10:04:21 -0700 |
---|---|---|
committer | Shawn O. Pearce <spearce@spearce.org> | 2008-09-29 10:15:07 -0700 |
commit | 9ba929ed652f5ed7707f1c684999af4ad02c4925 (patch) | |
tree | 434d9a7552de1c2dffaf723120fc90d83aa52743 /xdiff-interface.h | |
parent | c11c7a5db3676258512c4067c5279377811d3ab8 (diff) | |
parent | 3407a7a9e67b165902be85b0807e9ea789b3c67d (diff) | |
download | git-9ba929ed652f5ed7707f1c684999af4ad02c4925.tar.gz |
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
Diffstat (limited to 'xdiff-interface.h')
-rw-r--r-- | xdiff-interface.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/xdiff-interface.h b/xdiff-interface.h index 558492ba38..b3b5c933bf 100644 --- a/xdiff-interface.h +++ b/xdiff-interface.h @@ -17,5 +17,7 @@ int read_mmfile(mmfile_t *ptr, const char *filename); int buffer_is_binary(const char *ptr, unsigned long size); extern void xdiff_set_find_func(xdemitconf_t *xecfg, const char *line); +extern int git_xmerge_config(const char *var, const char *value, void *cb); +extern int git_xmerge_style; #endif |