| commit | cdb22c4ea70192a66930cade56baba4c71de5ed9 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 3 Sep 2008 02:27:19 +0000 (2 19:27 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 3 Sep 2008 02:27:19 +0000 (2 19:27 -0700) | ||
| tree | 0aef45b8ed571e1784f6d9bcf54bf8d2d4b2cac2 | treesnapshot (tar.gz zip) |
| parent | a1f00c2c9a8e47f9c5227bab59d456a0ce7fb4c9 | commitdiff |
| parent | 70a3f89733a4cd21631690ba980598fea2249067 | commitdiff |
Merge branch 'jc/better-conflict-resolution' into next
* jc/better-conflict-resolution:
git-merge documentation: describe how conflict is presented
checkout --conflict=<style>: recreate merge in a non-default style
* jc/better-conflict-resolution:
git-merge documentation: describe how conflict is presented
checkout --conflict=<style>: recreate merge in a non-default style
| Documentation/git-checkout.txt | diff1 | diff2 | blobhistory |
| Documentation/git-merge.txt | diff1 | diff2 | blobhistory |
| builtin-checkout.c | diff1 | diff2 | blobhistory |
| t/t7201-co.sh | diff1 | diff2 | blobhistory |