| commit | 43cc5994086222badc7abf16f8dec1bd070feada | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 19 Mar 2013 22:57:18 +0000 (19 15:57 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 19 Mar 2013 22:57:18 +0000 (19 15:57 -0700) | ||
| tree | c6f4840a0de90de9ed65bb203d3fb338303d05e7 | treesnapshot (tar.gz zip) |
| parent | b273fd3c61c27d68d6facf2b289707d307c3ccde | commitdiff |
| parent | 4549162e8d623d69ea48745fce3709e5133ce043 | commitdiff |
Merge branch 'kb/p4merge' into next
Adjust the order mergetools feeds the files to the p4merge backend
to match the p4 convention.
* kb/p4merge:
mergetools/p4merge: create a base if none available
mergetools/p4merge: swap LOCAL and REMOTE
Adjust the order mergetools feeds the files to the p4merge backend
to match the p4 convention.
* kb/p4merge:
mergetools/p4merge: create a base if none available
mergetools/p4merge: swap LOCAL and REMOTE
| git-merge-one-file.sh | diff1 | diff2 | blobhistory |
| git-sh-setup.sh | diff1 | diff2 | blobhistory |