diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-09 20:38:33 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-11 21:18:17 -0800 |
| commit | cb93c19365760d939f05d9a3c2ef4499f0d5ce16 (patch) | |
| tree | 7427fa1e25c61e2d647d8cbf314289d0616d021c /git-merge-one-file.sh | |
| parent | f7d24bbefb06c40f7738f471dda561ab45496d24 (diff) | |
| download | git-cb93c19365760d939f05d9a3c2ef4499f0d5ce16.tar.gz | |
merge-one-file: use common as base, instead of emptiness.
Unlike the previous round that merged the path added differently
in each branches using emptiness as the base, compute a common
version and use it as input to 'merge' program.
This would show the resulting (still conflicting) file left in
the working tree as:
common file contents...
<<<<<< FILENAME
version from our branch...
======
version from their branch...
>>>>>> .merge_file_XXXXXX
more common file contents...
when both sides added similar contents.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-one-file.sh')
| -rwxr-xr-x | git-merge-one-file.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh index 32e17cbc61..d9ee458150 100755 --- a/git-merge-one-file.sh +++ b/git-merge-one-file.sh @@ -57,18 +57,20 @@ case "${1:-.}${2:-.}${3:-.}" in # Modified in both, but differently. # "$1$2$3" | ".$2$3") + src2=`git-unpack-file $3` case "$1" in '') echo "Added $4 in both, but differently." + # This extracts OUR file in $orig, and uses git-apply to + # remove lines that are unique to ours. orig=`git-unpack-file $2` - : >$orig + diff -u -La/$orig -Lb/$orig $orig $src2 | git-apply --no-add ;; *) echo "Auto-merging $4." orig=`git-unpack-file $1` ;; esac - src2=`git-unpack-file $3` # We reset the index to the first branch, making # git-diff-file useful |