]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 96203bb 3a15048)
Merge branch 'bw/union-merge-refactor'
authorJunio C Hamano <gitster@pobox.com>
Sat, 20 Mar 2010 18:29:34 +0000 (11:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 20 Mar 2010 18:29:34 +0000 (11:29 -0700)
commit2bb76e139e3ab503992d227103f2bbb806b1f04b
tree3f69bde406db6eeb33f81f8fdd6d64035111a07dtree | snapshot
parent96203bb074544a37fcff9c3f2a68582b76caa263commit | diff
parent3a15048d833e2d6599091a9f7c14b0fa926c3bbfcommit | diff
Merge branch 'bw/union-merge-refactor'

* bw/union-merge-refactor:
  merge-file: add option to select union merge favor
  merge-file: add option to specify the marker size
  refactor merge flags into xmparam_t
  make union merge an xdl merge favor
builtin/merge-file.c diff1 | diff2 | blob | history
t/t6023-merge-file.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.