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 /quote.c | |
| parent | merge with /dev/null as base, instead of punting O==empty case (diff) | |
| download | tgif-cb93c19365760d939f05d9a3c2ef4499f0d5ce16.tar.xz | |
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 'quote.c')
0 files changed, 0 insertions, 0 deletions