facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-08 07:49:11 +03:00
Code Issues Projects Releases Wiki Activity
1,306 Commits 24 Branches 62 Tags 322 MiB
9282c26f18
Commit Graph

11 Commits

Author SHA1 Message Date
Thomas Arendsen Hein
a40b8a51f1 Cleaned up trap handling: 
- Use numbers instead of signal names
- No need to explicitly call "cleanup_exit RC" to exit with return code RC.
 2005-08-04 17:43:05 +01:00
Thomas Arendsen Hein
8076915aa6 If rejects are empty after using the editor, merge with diff+patch was ok. 2005-08-04 17:23:31 +01:00
Thomas Arendsen Hein
6f8f8feeba Shortened hgmerge a little bit. 2005-08-04 17:16:41 +01:00
Thomas Arendsen Hein
4bfe4b7759 Hide error message of type command. 2005-08-04 16:56:44 +01:00
Thomas Arendsen Hein
79e79d89bb Remove usage of ${par:-word}, which and mktemp. Quote filenames. 2005-07-29 14:51:41 +01:00
Thomas Arendsen Hein
51ae3ccedf Remove bashisms and use /bin/sh instead of /bin/bash. 
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Remove bashisms and use /bin/sh instead of /bin/bash.

manifest hash: 25560e04ff8ac33a6d8b82d2328b4e90578bee4c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)

iD8DBQFCxOEjW7P1GVgWeRoRAm9XAJ9IjlbMerPYEhKQQu7Ufcm6630cDwCfdXJ3
865XH6YVMuCYNjf3eibwQaM=
=r3gh
-----END PGP SIGNATURE-----
 2005-07-01 07:22:27 +01:00
Thomas Arendsen Hein
fe0ed7dcd1 Use vi if $EDITOR is unset. 2005-06-10 07:52:39 +01:00
Thomas Arendsen Hein
f08a8be556 Check if $DISPLAY is set before using tkdiff or kdiff3. 2005-06-10 07:50:20 +01:00
mpm@selenic.com
9cb4207872 Mark the usual things executable 
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Mark the usual things executable

manifest hash: e55dde46fd1a97ce338c1ac71278b67ca9d96bf7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCpz5RywK+sNU5EO8RAnypAJwLpjrQ09nMSJUELtCondHI0fvuVACfQu2J
mFi9D3L9ULGO457NWB4h3kY=
=3bcD
-----END PGP SIGNATURE-----
 2005-06-08 10:52:01 -08:00
mpm@selenic.com
53fcaa2eef hgmerge: use diff3 if available 
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

hgmerge: use diff3 if available

diff3 may be more readily available than merge

manifest hash: 67a314ac42aa78410d64a6c3d36c2d575a588533
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCoRUtywK+sNU5EO8RAmFPAJ0aN8VNvN9zpE/zov6wT3M98vGfDwCfXEOk
xZlQHYIGrCLOFQiCQxIfr7I=
=Asv9
-----END PGP SIGNATURE-----
 2005-06-03 18:42:53 -08:00
mpm@selenic.com
63e6cb46d3 Replace tkmerge with hgmerge 
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Replace tkmerge with hgmerge

hgmerge attempts to find and use merge, kdiff3, tkmerge, and diff+patch.
hg will use hgmerge unless overridden with HGMERGE

manifest hash: 9137a620df4b235e66343b0fd0dba87fe631546e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCoRGrywK+sNU5EO8RAi2VAJ9bh97ChGJymP/p8rvCuyNAMnk1bQCgrIGP
vYI6qlyWKQZ01ObUTAIg92o=
=+mRH
-----END PGP SIGNATURE-----
 2005-06-03 18:27:55 -08:00