The idea is that got patch can simply look for a line such as: commit - abcde1234567... to find the merge base commit ID to show in diff3 conflict markers. got log -p now displays commit IDs in its diff header, instead ofl tree or blob IDs. ok op@

This brings the rest of the regression test scripts in line with patch.sh.

Since the interpreter for the regress shell scripts are using /bin/sh this will usually imply some level of POSIX compliance (that isn't bash-specific, for instance). Some systems use dash as their sh shell and as such is stricter POSIX compliance. To help -portable, make the shell test checks use a single '=' for equality, rather than '=='.

This is important in cases like 'got diff file.txt file.txt' which should only show the diff for file.txt once. suggested by kn@

Need for filtering by path sugggested by kn@ ok naddy@

In order to portably handle the difference in how 'sed -i' works between *BSD and Linux, provide a wrapper to invoke the underying system sed(1) based on which OSTYPE is in use.

To minimise the amount of churn between the difference in date(1) and ln(n) semantics, use gdate and gln from coreutils.

positive feedback from Omar and kn ok kn

GNU ln uses -T instead of -h for no-target-directory. OK thomas.adam

ok tracey

ok stsp

ok stsp

Previous default output remains when test cases are run individually. ok tracey

ok semarie

ok millert@