Mercurial > hg
comparison hgmerge @ 1881:4392ccefe432
undo edit that was accident.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Fri, 10 Mar 2006 23:25:50 -0800 |
parents | 05c7d75be925 |
children | 4e44ca05a866 |
comparison
equal
deleted
inserted
replaced
1880:05c7d75be925 | 1881:4392ccefe432 |
---|---|
4 # | 4 # |
5 # This tries to find a way to do three-way merge on the current system. | 5 # This tries to find a way to do three-way merge on the current system. |
6 # The result ought to end up in $1. | 6 # The result ought to end up in $1. |
7 | 7 |
8 set -e # bail out quickly on failure | 8 set -e # bail out quickly on failure |
9 | |
10 echo $1 $2 $3 | |
11 | 9 |
12 LOCAL="$1" | 10 LOCAL="$1" |
13 BASE="$2" | 11 BASE="$2" |
14 OTHER="$3" | 12 OTHER="$3" |
15 | 13 |